More work

korlibs-archive · Mar 3, 2022 · 4f79eb4 · 4f79eb4
1 parent 3e1bc26
commit 4f79eb4
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 496 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -386,14 +386,20 @@ subprojects {
                         }
                     }
 
-                    for (baseName in listOf("nativeInteropMain", "posixInteropMain", "darwinInteropMain")) {
+                    for (baseName in listOf(
+                        "nativeInteropMain",
+                        "posixInteropMain",
+                        "darwinInteropMain",
+                        "linuxInteropMain",
+                    )) {
                         val nativeInteropMainFolder = file("src/$baseName/kotlin")
                         if (nativeInteropMainFolder.isDirectory) {
                             val currentNativeTarget = currentPlatformNativeTarget(project)
                             // @TODO: Copy instead of use the same source folder
                             for (target in allNativeTargets(project)) {
                                 if (baseName.contains("posix", ignoreCase = true) && !target.isPosix) continue
                                 if (baseName.contains("darwin", ignoreCase = true) && !target.isApple) continue
+                                if (baseName.contains("linux", ignoreCase = true) && !target.isLinux) continue
 
                                 val sourceSet = this@sourceSets.maybeCreate("${target.name}Main")
                                 val folder = when {

diff --git a/.../kotlin/com/soywiz/korgw/X11GameWindow.kt → .../kotlin/com/soywiz/korgw/X11GameWindow.kt b/.../kotlin/com/soywiz/korgw/X11GameWindow.kt → .../kotlin/com/soywiz/korgw/X11GameWindow.kt
diff --git a/korgw/src/linuxX64Main/kotlin/com/soywiz/korgw/X11GameWindow.kt b/korgw/src/linuxX64Main/kotlin/com/soywiz/korgw/X11GameWindow.kt
diff --git a/korio/src/iosArm32Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/iosArm32Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/iosArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/iosArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/iosSimulatorArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/iosSimulatorArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/iosX64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/iosX64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/linuxArm32HfpMain/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/linuxArm32HfpMain/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/linuxX64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/linuxX64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/macosArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/macosArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/macosX64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/macosX64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/mingwX64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/mingwX64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/nativeMain/kotlin/com/soywiz/korio/nativeExpect.kt b/korio/src/nativeMain/kotlin/com/soywiz/korio/nativeExpect.kt
@@ -1,4 +1,26 @@
 package com.soywiz.korio
 
 expect fun nativeCwd(): String
-expect val TARGET_INFO: String
+
+val nativeOsfamilyName: String get() = when (Platform.osFamily) {
+    OsFamily.MACOSX -> "macos"
+    OsFamily.IOS -> "ios"
+    OsFamily.LINUX -> "linux"
+    OsFamily.WINDOWS -> "windows"
+    OsFamily.ANDROID -> "android"
+    OsFamily.WASM -> "wasm"
+    OsFamily.TVOS -> "tvos"
+    OsFamily.WATCHOS -> "watchos"
+    else -> "unknown"
+}
+
+val nativeArchName: String get() = when (Platform.cpuArchitecture) {
+    CpuArchitecture.ARM32 -> "Arm32"
+    CpuArchitecture.ARM64 -> "Arm64"
+    CpuArchitecture.X86 -> "X86"
+    CpuArchitecture.X64 -> "X64"
+    CpuArchitecture.MIPS32 -> "Mips32"
+    CpuArchitecture.MIPSEL32 -> "Mipsel32"
+    CpuArchitecture.WASM32 -> "Wasm32"
+    else -> "Unknown"
+}
diff --git a/korio/src/nativeMain/kotlin/com/soywiz/korio/util/PlatformNative.kt b/korio/src/nativeMain/kotlin/com/soywiz/korio/util/PlatformNative.kt
@@ -1,4 +1,6 @@
 package com.soywiz.korio.util
 
+import com.soywiz.korio.*
+
 internal actual val rawPlatformName: String = "native"
-internal actual val rawOsName: String = com.soywiz.korio.TARGET_INFO
+internal actual val rawOsName: String = "$nativeOsfamilyName$nativeArchName"
diff --git a/korio/src/tvosArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/tvosArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/tvosSimulatorArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/tvosSimulatorArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/tvosX64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/tvosX64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/watchosArm32Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/watchosArm32Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/watchosArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/watchosArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/watchosSimulatorArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/watchosSimulatorArm64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/watchosX64Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/watchosX64Main/kotlin/com/soywiz/korio/TargetInfo.kt
diff --git a/korio/src/watchosX86Main/kotlin/com/soywiz/korio/TargetInfo.kt b/korio/src/watchosX86Main/kotlin/com/soywiz/korio/TargetInfo.kt