godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge branch 'master' of https://github.com/okamstudio/godot

Browse Source 
Conflicts:
	platform/windows/detect.py
This commit is contained in:
Juan Linietsky
2015-10-13 01:19:32 -03:00
parent 52e756752e aad2bbdb6f
commit b3cda43a0f
382 changed files with 110185 additions and 34862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/detect.py
View File

@@ -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"])