asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #764 from marynate/PR-fix-android-build

Browse source 
Fix android build on windows
This commit is contained in:
Juan Linietsky 2014-11-02 10:51:51 -03:00
commit 4ece8e90e0
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/android/SCsub
View file

@ -66,6 +66,6 @@ for x in env.android_module_libraries:
shutil.copy(x,abspath+"/java/libs") shutil.copy(x,abspath+"/java/libs")
env_android.SharedLibrary("#bin/libgodot_android",[android_objects],SHLIBSUFFIX=env["SHLIBSUFFIX"]) env_android.SharedLibrary("#bin/libgodot",[android_objects],SHLIBSUFFIX=env["SHLIBSUFFIX"])
#env.Command('#bin/libgodot_android.so', '#platform/android/libgodot_android.so', Copy('bin/libgodot_android.so', 'platform/android/libgodot_android.so')) #env.Command('#bin/libgodot_android.so', '#platform/android/libgodot_android.so', Copy('bin/libgodot_android.so', 'platform/android/libgodot_android.so'))

1
platform/android/detect.py
View file

@ -61,6 +61,7 @@ def configure(env):
import methods import methods
env.Tool('gcc') env.Tool('gcc')
env['SPAWN'] = methods.win32_spawn env['SPAWN'] = methods.win32_spawn
env['SHLIBSUFFIX'] = '.so'
# env.android_source_modules.append("../libs/apk_expansion") # env.android_source_modules.append("../libs/apk_expansion")
env.android_source_modules.append("../libs/google_play_services") env.android_source_modules.append("../libs/google_play_services")