diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-11-02 10:51:51 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-11-02 10:51:51 -0300 |
| commit | 4ece8e90e06a8f0d66d0388281a94acf9f1db8f3 (patch) | |
| tree | 5770bb194533f76ffda2ea9bfc951715b7ad5fad | |
| parent | e7134d6115ee66666b2c56b5adbe21a387de2efd (diff) | |
| parent | 1c6dcee4655a356d2b39928f65164c67a18d0660 (diff) | |
Merge pull request #764 from marynate/PR-fix-android-build
Fix android build on windows
| -rw-r--r-- | platform/android/SCsub | 2 | ||||
| -rw-r--r-- | platform/android/detect.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index 3c55b993ef..cffec5ae95 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -66,6 +66,6 @@ for x in env.android_module_libraries: 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')) diff --git a/platform/android/detect.py b/platform/android/detect.py index 062cc62b52..417f3e68ab 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -61,6 +61,7 @@ def configure(env): import methods env.Tool('gcc') env['SPAWN'] = methods.win32_spawn + env['SHLIBSUFFIX'] = '.so' # env.android_source_modules.append("../libs/apk_expansion") env.android_source_modules.append("../libs/google_play_services") |