diff options
author | punto- <ariel@okamstudio.com> | 2015-09-09 21:57:49 +0200 |
---|---|---|
committer | punto- <ariel@okamstudio.com> | 2015-09-09 21:57:49 +0200 |
commit | 4d900859e2a62d73710ee71e73ebfbebb9c0003c (patch) | |
tree | 4198f4c2ccc0e0b6ce4ea6be2e5d06175bd6f9ca /platform/iphone | |
parent | 2d570ac657d71f7967f6a520c672641f64b5272d (diff) |
ios build with osxcross
Diffstat (limited to 'platform/iphone')
-rw-r--r-- | platform/iphone/SCsub | 2 | ||||
-rw-r--r-- | platform/iphone/detect.py | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/platform/iphone/SCsub b/platform/iphone/SCsub index d495e3b5fc..d755b3dba0 100644 --- a/platform/iphone/SCsub +++ b/platform/iphone/SCsub @@ -34,5 +34,5 @@ obj = env_ios.Object('godot_iphone.cpp') prog = None prog = env_ios.Program('#bin/godot', [obj] + iphone_lib) -action = "dsymutil "+File(prog)[0].path+" -o " + File(prog)[0].path + ".dSYM" +action = "$IPHONEPATH/usr/bin/dsymutil "+File(prog)[0].path+" -o " + File(prog)[0].path + ".dSYM" env.AddPostAction(prog, action) diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index 6be3539b9d..e7a262a2bc 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -11,7 +11,8 @@ def get_name(): def can_build(): import sys - if sys.platform == 'darwin': + import os + if sys.platform == 'darwin' or os.environ.has_key("OSXCROSS_IOS"): return True return False @@ -28,6 +29,7 @@ def get_opts(): ('ios_gles22_override', 'Force GLES2.0 on iOS', 'yes'), ('ios_appirater', 'Enable Appirater', 'no'), ('ios_exceptions', 'Use exceptions when compiling on playbook', 'yes'), + ('ios_triple', 'Triple for ios toolchain', ''), ] def get_flags(): @@ -48,9 +50,10 @@ def configure(env): # env['CC'] = '$IPHONEPATH/Developer/usr/bin/gcc' # env['CXX'] = '$IPHONEPATH/Developer/usr/bin/g++' - env['CC'] = '$IPHONEPATH/usr/bin/clang' - env['CXX'] = '$IPHONEPATH/usr/bin/clang++' - env['AR'] = 'ar' + env['CC'] = '$IPHONEPATH/usr/bin/${ios_triple}clang' + env['CXX'] = '$IPHONEPATH/usr/bin/${ios_triple}clang++' + env['AR'] = '$IPHONEPATH/usr/bin/${ios_triple}ar' + env['RANLIB'] = '$IPHONEPATH/usr/bin/${ios_triple}ranlib' import string if (env["bits"]=="64"): |