You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-04 12:00:25 +00:00
Buildsystem: Improve detect.py readability and fix issues
Tried to organize the configure(env) calls in sections, using the same order
for all platforms whenever possible.
Apart from cosmetic changes, the following issues were fixed:
- Android: cleanup linkage, remove GLESv1_CM and GLESv2
- iPhone: Remove obsolete "ios_gles22_override" option
- OSX:
* Fix bits detection (default to 64) and remove obsolete "force_64_bits" option
(closes #9449)
* Make "fat" bits argument explicit
- Server: sync with X11
- Windows: clean up old DirectX 9 stuff
- X11:
* Do not require system OpenSSL for building (closes #9443)
* Fix typo'ed use_leak_sanitizer option
* Fix .llvm suffix overriding custom extra_suffix
This commit is contained in:
Rémi Verschelde
@@ -14,22 +14,17 @@ def get_name():
|
||||
|
||||
def can_build():
|
||||
|
||||
import os
|
||||
if (not os.environ.has_key("ANDROID_NDK_ROOT")):
|
||||
return False
|
||||
|
||||
return True
|
||||
return (os.environ.has_key("ANDROID_NDK_ROOT"))
|
||||
|
||||
|
||||
def get_opts():
|
||||
|
||||
return [
|
||||
('ANDROID_NDK_ROOT', 'the path to Android NDK',
|
||||
os.environ.get("ANDROID_NDK_ROOT", 0)),
|
||||
('ndk_platform', 'compile for platform: (android-<api> , example: android-18)', "android-18"),
|
||||
('android_arch', 'select compiler architecture: (armv7/armv6/x86)', "armv7"),
|
||||
('android_neon', 'enable neon (armv7 only)', "yes"),
|
||||
('android_stl', 'enable STL support in android port (for modules)', "no")
|
||||
('ANDROID_NDK_ROOT', 'Path to the Android NDK', os.environ.get("ANDROID_NDK_ROOT", 0)),
|
||||
('ndk_platform', 'Target platform (android-<api>, e.g. "android-18")', "android-18"),
|
||||
('android_arch', 'Target architecture (armv7/armv6/x86)', "armv7"),
|
||||
('android_neon', 'Enable NEON support (armv7 only)', "yes"),
|
||||
('android_stl', 'Enable Android STL support (for modules)', "no")
|
||||
]
|
||||
|
||||
|
||||
@@ -41,6 +36,7 @@ def get_flags():
|
||||
|
||||
|
||||
def create(env):
|
||||
|
||||
tools = env['TOOLS']
|
||||
if "mingw" in tools:
|
||||
tools.remove('mingw')
|
||||
@@ -54,7 +50,6 @@ def configure(env):
|
||||
|
||||
# Workaround for MinGW. See:
|
||||
# http://www.scons.org/wiki/LongCmdLinesOnWin32
|
||||
import os
|
||||
if (os.name == "nt"):
|
||||
|
||||
import subprocess
|
||||
@@ -92,35 +87,43 @@ def configure(env):
|
||||
|
||||
env['SPAWN'] = mySpawn
|
||||
|
||||
ndk_platform = env['ndk_platform']
|
||||
## Build type
|
||||
|
||||
if (env["target"].startswith("release")):
|
||||
env.Append(LINKFLAGS=['-O2'])
|
||||
env.Append(CPPFLAGS=['-O2', '-DNDEBUG', '-ffast-math', '-funsafe-math-optimizations', '-fomit-frame-pointer'])
|
||||
if (can_vectorize):
|
||||
env.Append(CPPFLAGS=['-ftree-vectorize'])
|
||||
if (env["target"] == "release_debug"):
|
||||
env.Append(CPPFLAGS=['-DDEBUG_ENABLED'])
|
||||
elif (env["target"] == "debug"):
|
||||
env.Append(LINKFLAGS=['-O0'])
|
||||
env.Append(CPPFLAGS=['-O0', '-D_DEBUG', '-UNDEBUG', '-DDEBUG_ENABLED',
|
||||
'-DDEBUG_MEMORY_ENABLED', '-g', '-fno-limit-debug-info'])
|
||||
|
||||
## Architecture
|
||||
|
||||
if env['android_arch'] not in ['armv7', 'armv6', 'x86']:
|
||||
env['android_arch'] = 'armv7'
|
||||
|
||||
if env['android_arch'] == 'x86':
|
||||
env["x86_libtheora_opt_gcc"] = True
|
||||
|
||||
if env['PLATFORM'] == 'win32':
|
||||
env.Tool('gcc')
|
||||
env['SHLIBSUFFIX'] = '.so'
|
||||
|
||||
neon_text = ""
|
||||
if env["android_arch"] == "armv7" and env['android_neon'] == 'yes':
|
||||
neon_text = " (with neon)"
|
||||
print("Godot Android!!!!! (" + env['android_arch'] + ")" + neon_text)
|
||||
|
||||
env.Append(CPPPATH=['#platform/android'])
|
||||
neon_text = " (with NEON)"
|
||||
print("Building for Android (" + env['android_arch'] + ")" + neon_text)
|
||||
|
||||
can_vectorize = True
|
||||
if env['android_arch'] == 'x86':
|
||||
env.extra_suffix = ".x86" + env.extra_suffix
|
||||
target_subpath = "x86-4.9"
|
||||
abi_subpath = "i686-linux-android"
|
||||
arch_subpath = "x86"
|
||||
env["x86_libtheora_opt_gcc"] = True
|
||||
elif env['android_arch'] == 'armv6':
|
||||
env.extra_suffix = ".armv6" + env.extra_suffix
|
||||
target_subpath = "arm-linux-androideabi-4.9"
|
||||
abi_subpath = "arm-linux-androideabi"
|
||||
arch_subpath = "armeabi"
|
||||
can_vectorize = False
|
||||
elif env["android_arch"] == "armv7":
|
||||
target_subpath = "arm-linux-androideabi-4.9"
|
||||
abi_subpath = "arm-linux-androideabi"
|
||||
@@ -130,6 +133,14 @@ def configure(env):
|
||||
else:
|
||||
env.extra_suffix = ".armv7" + env.extra_suffix
|
||||
|
||||
## Compiler configuration
|
||||
|
||||
env['SHLIBSUFFIX'] = '.so'
|
||||
|
||||
if env['PLATFORM'] == 'win32':
|
||||
env.Tool('gcc')
|
||||
env.use_windows_spawn_fix()
|
||||
|
||||
mt_link = True
|
||||
if (sys.platform.startswith("linux")):
|
||||
host_subpath = "linux-x86_64"
|
||||
@@ -142,10 +153,8 @@ def configure(env):
|
||||
mt_link = False
|
||||
host_subpath = "windows"
|
||||
|
||||
compiler_path = env["ANDROID_NDK_ROOT"] + \
|
||||
"/toolchains/llvm/prebuilt/" + host_subpath + "/bin"
|
||||
gcc_toolchain_path = env["ANDROID_NDK_ROOT"] + \
|
||||
"/toolchains/" + target_subpath + "/prebuilt/" + host_subpath
|
||||
compiler_path = env["ANDROID_NDK_ROOT"] + "/toolchains/llvm/prebuilt/" + host_subpath + "/bin"
|
||||
gcc_toolchain_path = env["ANDROID_NDK_ROOT"] + "/toolchains/" + target_subpath + "/prebuilt/" + host_subpath
|
||||
tools_path = gcc_toolchain_path + "/" + abi_subpath + "/bin"
|
||||
|
||||
# For Clang to find NDK tools in preference of those system-wide
|
||||
@@ -162,31 +171,28 @@ def configure(env):
|
||||
else:
|
||||
env['ARCH'] = 'arch-arm'
|
||||
|
||||
sysroot = env["ANDROID_NDK_ROOT"] + \
|
||||
"/platforms/" + ndk_platform + "/" + env['ARCH']
|
||||
sysroot = env["ANDROID_NDK_ROOT"] + "/platforms/" + env['ndk_platform'] + "/" + env['ARCH']
|
||||
common_opts = ['-fno-integrated-as', '-gcc-toolchain', gcc_toolchain_path]
|
||||
|
||||
## Compile flags
|
||||
|
||||
env.Append(CPPFLAGS=["-isystem", sysroot + "/usr/include"])
|
||||
env.Append(CPPFLAGS=string.split(
|
||||
'-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -fvisibility=hidden -fno-strict-aliasing'))
|
||||
env.Append(CPPFLAGS=string.split('-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -fvisibility=hidden -fno-strict-aliasing'))
|
||||
env.Append(CPPFLAGS=string.split('-DANDROID -DNO_STATVFS -DGLES2_ENABLED'))
|
||||
|
||||
env['neon_enabled'] = False
|
||||
if env['android_arch'] == 'x86':
|
||||
can_vectorize = True
|
||||
target_opts = ['-target', 'i686-none-linux-android']
|
||||
# The NDK adds this if targeting API < 21, so we can drop it when Godot targets it at least
|
||||
env.Append(CPPFLAGS=['-mstackrealign'])
|
||||
|
||||
elif env["android_arch"] == "armv6":
|
||||
can_vectorize = False
|
||||
target_opts = ['-target', 'armv6-none-linux-androideabi']
|
||||
env.Append(CPPFLAGS=string.split(
|
||||
'-D__ARM_ARCH_6__ -march=armv6 -mfpu=vfp -mfloat-abi=softfp'))
|
||||
env.Append(CPPFLAGS=string.split('-D__ARM_ARCH_6__ -march=armv6 -mfpu=vfp -mfloat-abi=softfp'))
|
||||
|
||||
elif env["android_arch"] == "armv7":
|
||||
can_vectorize = True
|
||||
target_opts = ['-target', 'armv7-none-linux-androideabi']
|
||||
env.Append(CPPFLAGS=string.split(
|
||||
'-D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -march=armv7-a -mfloat-abi=softfp'))
|
||||
env.Append(CPPFLAGS=string.split('-D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -march=armv7-a -mfloat-abi=softfp'))
|
||||
if env['android_neon'] == 'yes':
|
||||
env['neon_enabled'] = True
|
||||
env.Append(CPPFLAGS=['-mfpu=neon', '-D__ARM_NEON__'])
|
||||
@@ -196,21 +202,20 @@ def configure(env):
|
||||
env.Append(CPPFLAGS=target_opts)
|
||||
env.Append(CPPFLAGS=common_opts)
|
||||
|
||||
env.Append(LIBS=['OpenSLES'])
|
||||
env.Append(LIBS=['EGL', 'OpenSLES', 'android'])
|
||||
env.Append(LIBS=['log', 'GLESv1_CM', 'GLESv2', 'GLESv3','z'])
|
||||
if (env['android_stl'] == 'yes'):
|
||||
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/include"])
|
||||
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/" + arch_subpath + "/include"])
|
||||
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/" + arch_subpath])
|
||||
env.Append(LIBS=["gnustl_static"])
|
||||
else:
|
||||
env.Append(CXXFLAGS=['-fno-rtti', '-fno-exceptions', '-DNO_SAFE_CAST'])
|
||||
|
||||
if (sys.platform.startswith("darwin")):
|
||||
env['SHLIBSUFFIX'] = '.so'
|
||||
## Link flags
|
||||
|
||||
env['LINKFLAGS'] = ['-shared', '--sysroot=' +
|
||||
sysroot, '-Wl,--warn-shared-textrel']
|
||||
env.Append(LINKFLAGS=string.split(
|
||||
'-Wl,--fix-cortex-a8'))
|
||||
env.Append(LINKFLAGS=string.split(
|
||||
'-Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now'))
|
||||
env.Append(LINKFLAGS=string.split(
|
||||
'-Wl,-soname,libgodot_android.so -Wl,--gc-sections'))
|
||||
env['LINKFLAGS'] = ['-shared', '--sysroot=' + sysroot, '-Wl,--warn-shared-textrel']
|
||||
env.Append(LINKFLAGS=string.split('-Wl,--fix-cortex-a8'))
|
||||
env.Append(LINKFLAGS=string.split('-Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now'))
|
||||
env.Append(LINKFLAGS=string.split('-Wl,-soname,libgodot_android.so -Wl,--gc-sections'))
|
||||
if mt_link:
|
||||
env.Append(LINKFLAGS=['-Wl,--threads'])
|
||||
env.Append(LINKFLAGS=target_opts)
|
||||
@@ -221,45 +226,12 @@ def configure(env):
|
||||
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] +
|
||||
'/toolchains/arm-linux-androideabi-4.9/prebuilt/' + host_subpath + '/' + abi_subpath + '/lib'])
|
||||
|
||||
if (env["target"].startswith("release")):
|
||||
env.Append(LINKFLAGS=['-O2'])
|
||||
env.Append(CPPFLAGS=['-O2', '-DNDEBUG', '-ffast-math',
|
||||
'-funsafe-math-optimizations', '-fomit-frame-pointer'])
|
||||
if (can_vectorize):
|
||||
env.Append(CPPFLAGS=['-ftree-vectorize'])
|
||||
if (env["target"] == "release_debug"):
|
||||
env.Append(CPPFLAGS=['-DDEBUG_ENABLED'])
|
||||
elif (env["target"] == "debug"):
|
||||
env.Append(LINKFLAGS=['-O0'])
|
||||
env.Append(CPPFLAGS=['-O0', '-D_DEBUG', '-UNDEBUG', '-DDEBUG_ENABLED',
|
||||
'-DDEBUG_MEMORY_ENABLED', '-g', '-fno-limit-debug-info'])
|
||||
|
||||
env.Append(CPPFLAGS=['-DANDROID_ENABLED',
|
||||
'-DUNIX_ENABLED', '-DNO_FCNTL', '-DMPC_FIXED_POINT'])
|
||||
env.Append(CPPPATH=['#platform/android'])
|
||||
env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL', '-DMPC_FIXED_POINT'])
|
||||
env.Append(LIBS=['OpenSLES', 'EGL', 'GLESv3', 'android', 'log', 'z'])
|
||||
|
||||
# TODO: Move that to opus module's config
|
||||
if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
|
||||
if (env["android_arch"] == "armv6" or env["android_arch"] == "armv7"):
|
||||
env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
|
||||
env.opus_fixed_point = "yes"
|
||||
|
||||
if (env['android_stl'] == 'yes'):
|
||||
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] +
|
||||
"/sources/cxx-stl/gnu-libstdc++/4.9/include"])
|
||||
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] +
|
||||
"/sources/cxx-stl/gnu-libstdc++/4.9/libs/" + arch_subpath + "/include"])
|
||||
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] +
|
||||
"/sources/cxx-stl/gnu-libstdc++/4.9/libs/" + arch_subpath])
|
||||
env.Append(LIBS=["gnustl_static"])
|
||||
else:
|
||||
env.Append(CXXFLAGS=['-fno-rtti', '-fno-exceptions', '-DNO_SAFE_CAST'])
|
||||
|
||||
import methods
|
||||
env.Append(BUILDERS={'GLSL120': env.Builder(
|
||||
action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
|
||||
env.Append(BUILDERS={'GLSL': env.Builder(
|
||||
action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
|
||||
env.Append(BUILDERS={'GLSL120GLES': env.Builder(
|
||||
action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})
|
||||
|
||||
env.use_windows_spawn_fix()
|
||||
|
||||
Reference in New Issue
Block a user