From efd6541a4432a86bac1d7213f50b58cb022fab37 Mon Sep 17 00:00:00 2001 From: Mike Sinkovsky Date: Mon, 3 Feb 2020 10:17:09 +0500 Subject: [PATCH] Fix build of samples/tetris for raspberrypi (#3813) --- samples/tetris/build.gradle.kts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/samples/tetris/build.gradle.kts b/samples/tetris/build.gradle.kts index 33ce7b82e79..a63e7c6b864 100644 --- a/samples/tetris/build.gradle.kts +++ b/samples/tetris/build.gradle.kts @@ -6,12 +6,11 @@ plugins { } val hostOs = System.getProperty("os.name") -val isLinux = hostOs == "Linux" val isWindows = hostOs.startsWith("Windows") -// If host platform is Linux and RaspberryPi target is activated. +// If RaspberryPi target is activated. 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. val isMingwX86Build = @@ -65,7 +64,7 @@ kotlin { presets["macosX64"] -> includeDirs("/opt/local/include/SDL2", "/usr/local/include/SDL2") presets["linuxX64"] -> includeDirs("/usr/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")) } } }