diff options
| author | Juan Linietsky | 2015-10-13 01:19:32 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-10-13 01:19:32 -0300 |
| commit | b3cda43a0fb49e1cb9c8414077a23fa4b61ede38 (patch) | |
| tree | 1fee133b2fbc6f2bade96cc9914a449cbb9dbe1e /platform/android | |
| parent | 52e756752e1db9e4cf7c5bb7e92d44995ad674c4 (diff) | |
| parent | aad2bbdb6fb7c8217d7e75480b38e45f00cb3abd (diff) | |
| download | godot-b3cda43a0fb49e1cb9c8414077a23fa4b61ede38.tar.gz godot-b3cda43a0fb49e1cb9c8414077a23fa4b61ede38.tar.zst godot-b3cda43a0fb49e1cb9c8414077a23fa4b61ede38.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
platform/windows/detect.py
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/detect.py | 4 | ||||
| -rw-r--r-- | platform/android/os_android.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 59bbcd63c..c36e35484 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -196,6 +196,10 @@ def configure(env): env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL','-DMPC_FIXED_POINT']) # env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT']) + if(env["opus"]=="yes"): + env.Append(CFLAGS=["-DOPUS_ARM_OPT"]) + env.opus_fixed_point="yes" + if (env['android_stl']=='yes'): #env.Append(CCFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/system/include"]) env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.4.3/include"]) diff --git a/platform/android/os_android.h b/platform/android/os_android.h index e9b0d0019..dcaa1db65 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -39,7 +39,7 @@ #include "servers/physics_2d/physics_2d_server_sw.h" #include "servers/physics_2d/physics_2d_server_wrap_mt.h" #include "servers/visual/rasterizer.h" - +#include "main/input_default.h" //#ifdef USE_JAVA_FILE_ACCESS |