diff options
| author | Juan Linietsky | 2014-11-02 11:38:16 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-11-02 11:38:16 -0300 |
| commit | 0f0b21e84a85ab12d24cfe9b29d50e6af1ef8b19 (patch) | |
| tree | aa5f9da95f279eedef7d17456b4ee494313941fd /platform/android | |
| parent | d85b67be53bac252c0a28b799d56d1b359c4ee99 (diff) | |
| parent | a61325661ef6337f1b6f9d2acf6e0a55889a1366 (diff) | |
| download | godot-0f0b21e84a85ab12d24cfe9b29d50e6af1ef8b19.tar.gz godot-0f0b21e84a85ab12d24cfe9b29d50e6af1ef8b19.tar.zst godot-0f0b21e84a85ab12d24cfe9b29d50e6af1ef8b19.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform/android')
| -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 3c55b993e..cffec5ae9 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 062cc62b5..417f3e68a 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") |