godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix IPhone and OSX cross compilation 

(cherry picked from commit e7b9e2f970)
This commit is contained in:
Fabio Alessandrelli 2018-03-28 18:45:54 +02:00 committed by Hein-Pieter van Braam
parent e317ab9abe
commit 66b36235c9
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/webm/libvpx/SCsub
View File

@ -350,7 +350,7 @@ if webm_simd_optimizations == False:
env_libvpx.add_source_files(env.modules_sources, libvpx_sources) env_libvpx.add_source_files(env.modules_sources, libvpx_sources)
if webm_cpu_x86: if webm_cpu_x86:
is_clang_or_gcc = ('gcc' in env["CC"]) or ('clang' in env["CC"]) is_clang_or_gcc = ('gcc' in env["CC"]) or ('clang' in env["CC"]) or ("OSXCROSS_ROOT" in os.environ)
env_libvpx_mmx = env_libvpx.Clone() env_libvpx_mmx = env_libvpx.Clone()
if cpu_bits == '32' and is_clang_or_gcc: if cpu_bits == '32' and is_clang_or_gcc:

7
platform/iphone/SCsub
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
import os
Import('env') Import('env')
@ -21,6 +22,10 @@ ios_lib = env_ios.add_library('iphone', iphone_lib)
def combine_libs(target=None, source=None, env=None): def combine_libs(target=None, source=None, env=None):
lib_path = target[0].srcnode().abspath lib_path = target[0].srcnode().abspath
env.Execute('$IPHONEPATH/usr/bin/libtool -static -o "' + lib_path + '" ' + ' '.join([('"' + lib.srcnode().abspath + '"') for lib in source])) if ("OSXCROSS_IOS" in os.environ):
libtool = '$IPHONEPATH/usr/bin/${ios_triple}libtool'
else:
libtool = "$IPHONEPATH/usr/bin/libtool"
env.Execute(libtool + ' -static -o "' + lib_path + '" ' + ' '.join([('"' + lib.srcnode().abspath + '"') for lib in source]))
combine_command = env_ios.Command('#bin/libgodot' + env_ios['LIBSUFFIX'], [ios_lib] + env_ios['LIBS'], combine_libs) combine_command = env_ios.Command('#bin/libgodot' + env_ios['LIBSUFFIX'], [ios_lib] + env_ios['LIBS'], combine_libs)

1
platform/osx/detect.py
View File

@ -107,6 +107,7 @@ def configure(env):
env['AR'] = basecmd + "ar" env['AR'] = basecmd + "ar"
env['RANLIB'] = basecmd + "ranlib" env['RANLIB'] = basecmd + "ranlib"
env['AS'] = basecmd + "as" env['AS'] = basecmd + "as"
env.Append(CCFLAGS=['-D__MACPORTS__']) #hack to fix libvpx MM256_BROADCASTSI128_SI256 define
if (env["CXX"] == "clang++"): if (env["CXX"] == "clang++"):
env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND']) env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])