From 9a07fd322d85668bbf568232828c5dc4525bcd63 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 3 Apr 2017 13:59:33 +0700 Subject: [PATCH] samples: Update comments in the tetris gradle build --- samples/tetris/build.gradle | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/samples/tetris/build.gradle b/samples/tetris/build.gradle index 7c42cd88439..00731c8a6bf 100644 --- a/samples/tetris/build.gradle +++ b/samples/tetris/build.gradle @@ -1,8 +1,3 @@ -/** - * Use `./gradlew build` to build the project. - * e.g. ./gradlew buildMacbook - */ - buildscript { repositories { mavenCentral() @@ -34,15 +29,13 @@ konanInterop { sdlIphone { defFile 'sdl.def' - includeDirs '../../dist/dependencies/target-sysroot-2-darwin-ios/System/Library/Frameworks/SDL2.framework/Headers' - includeDirs '../../dependencies/target-sysroot-2-darwin-ios/System/Library/Frameworks/SDL2.framework/Headers' + includeDirs "${project.property("konan.home")}/dependencies/target-sysroot-2-darwin-ios/System/Library/Frameworks/SDL2.framework/Headers" target 'iphone' } sdlRaspberry { defFile 'sdl.def' - includeDirs '../../dist/dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2' - includeDirs '../../dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2' + includeDirs "${project.property("konan.home")}/dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2" target 'raspberrypi' } } @@ -51,7 +44,8 @@ konanArtifacts { TetrisMacbook { inputFiles project.file('Tetris.kt') useInterop 'sdlMacbook' - linkerOpts "-F ${System.getProperty("user.home")}/Library/Frameworks -framework SDL2 -L/usr/local/lib -lSDL2 -F /Library/Frameworks -framework SDL2 -L/opt/local/lib" + linkerOpts "-F ${System.getProperty("user.home")}/Library/Frameworks -F /Library/Frameworks -framework SDL2 -L/usr/local/lib -L/opt/local/lib -lSDL2" + // Use this line instead of the previous one if you've got a 'No SDL-framework' error. //linkerOpts "-L/opt/local/lib -L/usr/local/lib -lSDL2" target 'macbook' }