From 7f51bb7b1c5a8104afa859e38b8b207abfbd2093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Tue, 4 Oct 2016 16:55:29 +0200 Subject: Fix compile flags not getting to the Android build --- platform/android/detect.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'platform/android/detect.py') diff --git a/platform/android/detect.py b/platform/android/detect.py index 49ffc86658..7e482047c9 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -168,11 +168,11 @@ def configure(env): env['neon_enabled']=False if env['android_arch']=='x86': - env['CCFLAGS'] = string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__GLIBC__ -Wno-psabi -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED') + env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__GLIBC__ -Wno-psabi -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED')) elif env["android_arch"]=="armv6": - env['CCFLAGS'] = string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_6__ -D__GLIBC__ -Wno-psabi -march=armv6 -mfpu=vfp -mfloat-abi=softfp -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED') + env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_6__ -D__GLIBC__ -Wno-psabi -march=armv6 -mfpu=vfp -mfloat-abi=softfp -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED')) elif env["android_arch"]=="armv7": - env['CCFLAGS'] = string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -D__GLIBC__ -Wno-psabi -march=armv7-a -mfloat-abi=softfp -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED') + env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -D__GLIBC__ -Wno-psabi -march=armv7-a -mfloat-abi=softfp -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED')) if env['android_neon']=='yes': env['neon_enabled']=True env.Append(CCFLAGS=['-mfpu=neon','-D__ARM_NEON__']) -- cgit v1.2.3 From f87e32696de6126f05d0b839a2a3689dd16fe73f Mon Sep 17 00:00:00 2001 From: Anthony Fieroni Date: Thu, 6 Oct 2016 14:51:16 +0300 Subject: Correct OS architecture detection Signed-off-by: Anthony Fieroni --- platform/android/detect.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'platform/android/detect.py') diff --git a/platform/android/detect.py b/platform/android/detect.py index 49ffc86658..469f98244d 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -124,19 +124,20 @@ def configure(env): gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/"; - if (sys.platform.find("linux")==0): - if (platform.architecture()[0]=='64bit' or os.path.isdir(gcc_path+"linux-x86_64/bin")): # check was not working + if (sys.platform.startswith("linux")): + if (platform.machine().endswith('64')): gcc_path=gcc_path+"/linux-x86_64/bin" else: gcc_path=gcc_path+"/linux-x86/bin" - elif (sys.platform=="darwin"): - gcc_path=gcc_path+"/darwin-x86_64/bin" #this may be wrong + elif (sys.platform.startswith("darwin")): + gcc_path=gcc_path+"/darwin-x86_64/bin" env['SHLINKFLAGS'][1] = '-shared' env['SHLIBSUFFIX'] = '.so' - elif (os.name=="nt"): - gcc_path=gcc_path+"/windows-x86_64/bin" #this may be wrong - - + elif (os.platform.startswith('win')): + if (platform.machine().endswith('64')): + gcc_path=gcc_path+"/windows-x86_64/bin" + else: + gcc_path=gcc_path+"/windows-x86/bin" env['ENV']['PATH'] = gcc_path+":"+env['ENV']['PATH'] if env['android_arch']=='x86': -- cgit v1.2.3 From f63bf12193deaf9cae5b1d6c7289afc17a7de946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 14 Oct 2016 18:21:23 +0200 Subject: Drop nedmalloc which is apparently not used anymore --- platform/android/detect.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'platform/android/detect.py') diff --git a/platform/android/detect.py b/platform/android/detect.py index 7e482047c9..8e9a58da19 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -34,10 +34,9 @@ def get_flags(): return [ ('tools', 'no'), - ('nedmalloc', 'no'), ('builtin_zlib', 'no'), - ('openssl','builtin'), #use builtin openssl - ] + ('openssl', 'builtin'), #use builtin openssl + ] def create(env): -- cgit v1.2.3 From d9a291f6411f2e571c181da0ac89f550ba73f681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 12 Oct 2016 20:37:38 +0200 Subject: ogg/vorbis/opus: Make them modules and unbundle thirdparty libs Took the opportunity to undo the Godot changed made to the opus source. The opus module should eventually be built in its own environment to avoid polluting others with too many include dirs and defines. TODO: Fix the platform/ stuff for opus. --- platform/android/detect.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'platform/android/detect.py') diff --git a/platform/android/detect.py b/platform/android/detect.py index 8e9a58da19..9087d5343e 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -203,7 +203,8 @@ def configure(env): env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL','-DMPC_FIXED_POINT']) # env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT']) - if(env["opus"]=="yes"): + # 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" -- cgit v1.2.3 From cbf52606f4928df46fc89d37d781bad782f0616e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 14 Oct 2016 18:58:24 +0200 Subject: zlib: Split thirdparty files, simplify scons option --- platform/android/detect.py | 1 - 1 file changed, 1 deletion(-) (limited to 'platform/android/detect.py') diff --git a/platform/android/detect.py b/platform/android/detect.py index 9087d5343e..8d56dbcdaa 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -34,7 +34,6 @@ def get_flags(): return [ ('tools', 'no'), - ('builtin_zlib', 'no'), ('openssl', 'builtin'), #use builtin openssl ] -- cgit v1.2.3 From 4ffa8f224d8d57520bd4953d67291c83152cd5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= Date: Sun, 16 Oct 2016 22:22:21 +0200 Subject: Theora: Don't compile unnecessary files, rename "x86_opt_*" --- platform/android/detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform/android/detect.py') diff --git a/platform/android/detect.py b/platform/android/detect.py index 8d56dbcdaa..f778e9a095 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -96,7 +96,7 @@ def configure(env): if env['android_arch']=='x86': env['NDK_TARGET']=env['NDK_TARGET_X86'] - env["x86_opt_gcc"]=True + env["x86_libtheora_opt_gcc"]=True if env['PLATFORM'] == 'win32': env.Tool('gcc') -- cgit v1.2.3 From 638a31d972bae0906d3dd7c1170e3f4720298b66 Mon Sep 17 00:00:00 2001 From: Randy Tan Shaoxian Date: Thu, 20 Oct 2016 21:17:21 +0800 Subject: Fixed tiny error in detect.py causing compilation for Android to fail. (cherry picked from commit c9d7f77c6ffea4691fba2071caec2d63d927b4d1) --- platform/android/detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform/android/detect.py') diff --git a/platform/android/detect.py b/platform/android/detect.py index acf4ce412a..842036f986 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -131,7 +131,7 @@ def configure(env): gcc_path=gcc_path+"/darwin-x86_64/bin" env['SHLINKFLAGS'][1] = '-shared' env['SHLIBSUFFIX'] = '.so' - elif (os.platform.startswith('win')): + elif (sys.platform.startswith('win')): if (platform.machine().endswith('64')): gcc_path=gcc_path+"/windows-x86_64/bin" else: -- cgit v1.2.3