diff options
| author | Rémi Verschelde | 2016-05-01 11:38:15 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-05-01 12:28:20 +0200 |
| commit | d29087cc537815340fa7483a3d251df3329b0599 (patch) | |
| tree | 1fdc22c11bffd5e5324041928a37e033be8481d2 /platform/android | |
| parent | 27461a79dcb28cdf696d0c296ca9522d44260210 (diff) | |
| download | godot-d29087cc537815340fa7483a3d251df3329b0599.tar.gz godot-d29087cc537815340fa7483a3d251df3329b0599.tar.zst godot-d29087cc537815340fa7483a3d251df3329b0599.zip | |
OSX: Fix lib suffix for Android lib (#4499)
Fixes #1452.
(cherry picked from commit 94274b9ab517aac175d205636f8561ff76d45eda)
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/detect.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 366ec6321..7d7fd174e 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -102,9 +102,7 @@ def configure(env): env["x86_opt_gcc"]=True if env['PLATFORM'] == 'win32': - import methods env.Tool('gcc') - #env['SPAWN'] = methods.win32_spawn env['SHLIBSUFFIX'] = '.so' @@ -127,7 +125,6 @@ def configure(env): gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/"; - import os 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 gcc_path=gcc_path+"/linux-x86_64/bin" @@ -136,6 +133,7 @@ def configure(env): elif (sys.platform=="darwin"): gcc_path=gcc_path+"/darwin-x86_64/bin" #this may be wrong env['SHLINKFLAGS'][1] = '-shared' + env['SHLIBSUFFIX'] = '.so' elif (os.name=="nt"): gcc_path=gcc_path+"/windows-x86_64/bin" #this may be wrong |