File tree Expand file tree Collapse file tree 3 files changed +14
-1
lines changed
src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/ui Expand file tree Collapse file tree 3 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -3,11 +3,14 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
33import org.jetbrains.compose.desktop.application.dsl.TargetFormat
44
55plugins {
6+
67 alias(libs.plugins.kotlinMultiplatform)
78 alias(libs.plugins.composeMultiplatform)
89 alias(libs.plugins.composeCompiler)
910 alias(libs.plugins.composeHotReload)
1011 alias(libs.plugins.kotlinSerialization)
12+ // alias(libs.plugins.composeDesktop)
13+ // alias(libs.plugins.compose.compiler)
1114}
1215
1316kotlin {
@@ -81,6 +84,8 @@ kotlin {
8184
8285 implementation(" com.github.skydoves:colorpicker-compose:1.1.2" )
8386
87+
88+
8489// val currentOS = DefaultNativePlatform.getCurrentOperatingSystem()
8590// when {
8691// currentOS.isWindows -> {
Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ import androidx.compose.ui.unit.dp
1717import androidx.compose.ui.unit.em
1818import cafe.adriel.voyager.navigator.CurrentScreen
1919import com.jogamp.opengl.GLCapabilities
20+ import com.jogamp.opengl.GLException
2021import com.jogamp.opengl.GLProfile
2122import com.jogamp.opengl.awt.GLCanvas
2223import com.jogamp.opengl.util.FPSAnimator
@@ -154,7 +155,13 @@ fun JoglCanvas(canvasRefSet: (GLCanvas) -> Unit) {
154155
155156 val canvas = remember {
156157 println (" Initializing factory" )
157- val profile = GLProfile .get(GLProfile .GL3 )
158+ var profile: GLProfile
159+ try {
160+ profile = GLProfile .get(GLProfile .GL3 )
161+ } catch (e: GLException ) {
162+ println (" GL3 is not available, trying to use GL3bc" )
163+ profile = GLProfile .get(GLProfile .GL3bc )
164+ }
158165 val capabilities = GLCapabilities (profile)
159166// capabilities.isPBuffer = true
160167 capabilities.apply {
Original file line number Diff line number Diff line change 11[versions ]
22androidx-lifecycle = " 2.9.1"
33composeHotReload = " 1.0.0-beta05"
4+ composeDesktop = " 1.7.1"
45composeMultiplatform = " 1.8.2"
56junit = " 4.13.2"
67kotlin = " 2.2.0"
You can’t perform that action at this time.
0 commit comments