diff options
| author | okamstudio <juan@okamstudio.com> | 2014-02-20 23:55:22 -0200 |
|---|---|---|
| committer | okamstudio <juan@okamstudio.com> | 2014-02-20 23:55:22 -0200 |
| commit | 0c44adc51fbf802f307f36b31d528f25eef7e21f (patch) | |
| tree | b9039300ce104e7f305ee404daf508a854e4956b /platform/isim/SCsub | |
| parent | fb69076ef08915f58dec038891ce3b5decc7dd32 (diff) | |
| parent | 2371a92fde0e88d80a898931d4d6bfb541607f7a (diff) | |
Merge pull request #89 from marynate/PR-Fix_iOS_Simulator_Build
Fix iOS Simulator Build
Diffstat (limited to 'platform/isim/SCsub')
| -rw-r--r-- | platform/isim/SCsub | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/platform/isim/SCsub b/platform/isim/SCsub index 6fb568465e..e7de935b2e 100644 --- a/platform/isim/SCsub +++ b/platform/isim/SCsub @@ -5,11 +5,14 @@ iphone_lib = [ '#platform/iphone/os_iphone.cpp', #'#platform/iphone/rasterizer_iphone.cpp', '#platform/iphone/audio_driver_iphone.cpp', + '#platform/iphone/sem_iphone.cpp', '#platform/iphone/gl_view.mm', '#platform/iphone/main.m', '#platform/iphone/app_delegate.mm', '#platform/iphone/view_controller.mm', - '#platform/iphone/scoreloop_ios.mm', + '#platform/iphone/game_center.mm', + '#platform/iphone/in_app_store.mm', + '#platform/iphone/Appirater.m', ] @@ -17,14 +20,25 @@ iphone_lib = [ #iphone_lib = env.Library('iphone', iphone_lib) -obj = env.Object('#platform/iphone/godot_iphone.cpp') +env_ios = env.Clone(); + +if env['ios_gles22_override'] == "yes": + env_ios.Append(CPPFLAGS=['-DGLES2_OVERRIDE']) + +if env['ios_GLES1_override'] == "yes": + env_ios.Append(CPPFLAGS=['-DGLES1_OVERRIDE']) + +if env['ios_appirater'] == "yes": + env_ios.Append(CPPFLAGS=['-DAPPIRATER_ENABLED']) + +obj = env_ios.Object('#platform/iphone/godot_iphone.cpp') prog = None if env["target"]=="release": - prog = env.Program('#bin/godot_iphone_opt', [obj] + iphone_lib) + prog = env_ios.Program('#bin/godot_opt', [obj] + iphone_lib) #action = "dsymutil "+File(prog)[0].path+" -o ../build/script_exec/build/Debug-iphoneos/script_exec.app.dSYM" #env.AddPostAction(prog, action) else: - prog = env.Program('#bin/godot', [obj] + iphone_lib) + prog = env_ios.Program('#bin/godot', [obj] + iphone_lib) #action = "dsymutil "+File(prog)[0].path+" -o ../build/script_exec/build/Debug-iphoneos/script_exec.app.dSYM" #env.AddPostAction(prog, action) |