azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build of samples/tetris for raspberrypi (#3813)

Browse Source
This commit is contained in:
Mike Sinkovsky
2020-02-03 10:17:09 +05:00
committed by GitHub
parent f818d7639f
commit efd6541a44
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/tetris/build.gradle.kts
+3 -4
View File
@@ -6,12 +6,11 @@ plugins {
} }
val hostOs = System.getProperty("os.name") val hostOs = System.getProperty("os.name")
val isLinux = hostOs == "Linux"
val isWindows = hostOs.startsWith("Windows") val isWindows = hostOs.startsWith("Windows")
// If host platform is Linux and RaspberryPi target is activated. // If RaspberryPi target is activated.
val isRaspberryPiBuild = val isRaspberryPiBuild =
isLinux && project.findProperty("tetris.raspberrypi.build")?.toString()?.toBoolean() == true project.findProperty("tetris.raspberrypi.build")?.toString()?.toBoolean() == true
// If host platform is Windows and x86 target is activated. // If host platform is Windows and x86 target is activated.
val isMingwX86Build = val isMingwX86Build =
@@ -65,7 +64,7 @@ kotlin {
presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2") presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2")
presets["linuxX64"] -> includeDirs("/usr/include/SDL2") presets["linuxX64"] -> includeDirs("/usr/include/SDL2")
presets["mingwX64"], presets["mingwX86"] -> includeDirs(mingwPath.resolve("include/SDL2")) presets["mingwX64"], presets["mingwX86"] -> includeDirs(mingwPath.resolve("include/SDL2"))
presets["linuxArm32Hfp"] -> includeDirs(kotlinNativeDataPath.resolve("dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2")) presets["linuxArm32Hfp"] -> includeDirs(kotlinNativeDataPath.resolve("dependencies/target-sysroot-2-raspberrypi/usr/include/SDL2"))
} }
} }
} }