Revert "samples: Rename targets for tetris build."

This reverts commit dbcfa84498.
This commit is contained in:
Ilya Matveev
2017-05-10 11:24:45 +07:00
committed by ilmat192
parent da6be1f1f7
commit 0a7e38c25a
+10 -10
View File
@@ -14,11 +14,11 @@ buildscript {
apply plugin: 'konan' apply plugin: 'konan'
konanInterop { konanInterop {
sdlOSX { sdlMacbook {
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"
target 'osx' target 'macbook'
} }
sdlLinux { sdlLinux {
@@ -27,10 +27,10 @@ konanInterop {
target 'linux' target 'linux'
} }
sdlIOS { sdlIphone {
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 'iphone'
} }
sdlRaspberry { sdlRaspberry {
@@ -41,13 +41,13 @@ konanInterop {
} }
konanArtifacts { konanArtifacts {
TetrisOSX { TetrisMacbook {
inputFiles project.file('Tetris.kt') inputFiles project.file('Tetris.kt')
useInterop 'sdlOSX' useInterop 'sdlMacbook'
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"
target 'osx' target 'macbook'
} }
TetrisLinux { TetrisLinux {
@@ -58,16 +58,16 @@ konanArtifacts {
target 'linux' target 'linux'
} }
TetrisIOS { TetrisIphone {
inputFiles project.file('Tetris.kt') inputFiles project.file('Tetris.kt')
useInterop 'sdlIOS' useInterop 'sdlIphone'
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 ' +
'-framework QuartzCore -framework UIKit' '-framework QuartzCore -framework UIKit'
noMain() noMain()
target 'ios' target 'iphone'
} }
TetrisRaspberry { TetrisRaspberry {