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

OSX: Fix lib suffix for Android lib (#4499) 

Fixes #1452.
(cherry picked from commit 94274b9ab5)
This commit is contained in:
Rémi Verschelde 2016-05-01 11:38:15 +02:00 committed by Rémi Verschelde
parent 27461a79dc
commit d29087cc53
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/detect.py
View File

@ -102,9 +102,7 @@ def configure(env):
env["x86_opt_gcc"]=True env["x86_opt_gcc"]=True
if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'win32':
import methods
env.Tool('gcc') env.Tool('gcc')
#env['SPAWN'] = methods.win32_spawn
env['SHLIBSUFFIX'] = '.so' env['SHLIBSUFFIX'] = '.so'
@ -127,7 +125,6 @@ def configure(env):
gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/"; gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/";
import os
if (sys.platform.find("linux")==0): 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 (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" gcc_path=gcc_path+"/linux-x86_64/bin"
@ -136,6 +133,7 @@ def configure(env):
elif (sys.platform=="darwin"): elif (sys.platform=="darwin"):
gcc_path=gcc_path+"/darwin-x86_64/bin" #this may be wrong gcc_path=gcc_path+"/darwin-x86_64/bin" #this may be wrong
env['SHLINKFLAGS'][1] = '-shared' env['SHLINKFLAGS'][1] = '-shared'
env['SHLIBSUFFIX'] = '.so'
elif (os.name=="nt"): elif (os.name=="nt"):
gcc_path=gcc_path+"/windows-x86_64/bin" #this may be wrong gcc_path=gcc_path+"/windows-x86_64/bin" #this may be wrong