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

Revert "samples: Use camel case in tetris gradle build script"

Browse Source 
This reverts commit 409d00db96.
This commit is contained in:
Ilya Matveev
2017-05-10 11:24:40 +07:00
committed by ilmat192
parent 88e3c1d05c
commit da6be1f1f7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/tetris/build.gradle
+6 -6
View File
@@ -14,7 +14,7 @@ buildscript {
apply plugin: 'konan' apply plugin: 'konan'
konanInterop { konanInterop {
sdlOsx { sdlOSX {
defFile 'sdl.def' defFile 'sdl.def'
includeDirs '/Library/Frameworks/SDL2.framework/Headers', "${System.getProperty("user.home")}/Library/Frameworks/SDL2.framework/Headers" includeDirs '/Library/Frameworks/SDL2.framework/Headers', "${System.getProperty("user.home")}/Library/Frameworks/SDL2.framework/Headers"
@@ -27,7 +27,7 @@ konanInterop {
target 'linux' target 'linux'
} }
sdlIos { sdlIOS {
defFile 'sdl.def' defFile 'sdl.def'
includeDirs "${project.property("konan.home")}/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 'ios' target 'ios'
@@ -41,9 +41,9 @@ konanInterop {
} }
konanArtifacts { konanArtifacts {
TetrisOsx { TetrisOSX {
inputFiles project.file('Tetris.kt') inputFiles project.file('Tetris.kt')
useInterop 'sdlOsx' useInterop 'sdlOSX'
linkerOpts "-F ${System.getProperty("user.home")}/Library/Frameworks -F /Library/Frameworks -framework SDL2" linkerOpts "-F ${System.getProperty("user.home")}/Library/Frameworks -F /Library/Frameworks -framework SDL2"
// Use this line instead of the previous one if you've got a 'No SDL-framework' error. // 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" //linkerOpts "-L/opt/local/lib -L/usr/local/lib -lSDL2"
@@ -58,10 +58,10 @@ konanArtifacts {
target 'linux' target 'linux'
} }
TetrisIos { TetrisIOS {
inputFiles project.file('Tetris.kt') inputFiles project.file('Tetris.kt')
useInterop 'sdlIos' useInterop 'sdlIOS'
linkerOpts '-framework SDL2 -framework AVFoundation -framework CoreGraphics -framework CoreMotion ' + linkerOpts '-framework SDL2 -framework AVFoundation -framework CoreGraphics -framework CoreMotion ' +
'-framework Foundation -framework GameController -framework AudioToolbox -framework OpenGLES ' + '-framework Foundation -framework GameController -framework AudioToolbox -framework OpenGLES ' +