diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-08-01 23:35:36 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-08-01 23:35:36 -0300 |
| commit | a1d6cd02e39fbc84bc6f06e01496c11759b99c2d (patch) | |
| tree | ec17af68e4ff7e66026939969d3be050c21db3f0 | |
| parent | 678948068bbde7f12a9c5f28a467b6cf4d127851 (diff) | |
Fixes from Ariel
| -rw-r--r-- | platform/iphone/SCsub | 2 | ||||
| -rw-r--r-- | platform/iphone/audio_driver_iphone.cpp | 13 | ||||
| -rw-r--r-- | platform/iphone/detect.py | 5 | ||||
| -rw-r--r-- | platform/iphone/globals/global_defaults.cpp | 1 |
4 files changed, 13 insertions, 8 deletions
diff --git a/platform/iphone/SCsub b/platform/iphone/SCsub index 4a4e06cc0f..d30d101e1b 100644 --- a/platform/iphone/SCsub +++ b/platform/iphone/SCsub @@ -35,7 +35,7 @@ if env['ios_appirater'] == "yes": obj = env_ios.Object('godot_iphone.cpp') prog = None -if env["target"]=="release" || env["target"] == "release_debug": +if env["target"]=="release" or env["target"] == "release_debug": prog = env_ios.Program('#bin/godot_opt', [obj] + iphone_lib) #action = "dsymutil "+File(prog)[0].path+" -o ../build/script_exec/build/Debug-iphoneos/script_exec.app.dSYM" #env.AddPostAction(prog, action) diff --git a/platform/iphone/audio_driver_iphone.cpp b/platform/iphone/audio_driver_iphone.cpp index 611f57dea3..c3ba0e6944 100644 --- a/platform/iphone/audio_driver_iphone.cpp +++ b/platform/iphone/audio_driver_iphone.cpp @@ -101,10 +101,10 @@ OSStatus AudioDriverIphone::output_callback(void *inRefCon, bool mix = true; - if (!ad_active) + if (!ad->active) mix = false; - else { - mix = mutex->try_lock() == OK; + else if (ad->mutex) { + mix = ad->mutex->try_lock() == OK; }; @@ -127,9 +127,9 @@ OSStatus AudioDriverIphone::output_callback(void *inRefCon, while (frames_left) { int frames = MIN(frames_left, ad->buffer_frames); - ad->lock(); + //ad->lock(); ad->audio_server_process(frames, ad->samples_in); - ad->unlock(); + //ad->unlock(); for(int i = 0; i < frames * ad->channels; i++) { @@ -141,6 +141,9 @@ OSStatus AudioDriverIphone::output_callback(void *inRefCon, }; }; + if (ad->mutex) + ad->mutex->unlock(); + return 0; }; diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index 33bde58041..9df9dc16c1 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -35,7 +35,7 @@ def get_flags(): return [ ('lua', 'no'), - ('tools', 'yes'), + ('tools', 'no'), ('nedmalloc', 'no'), ('webp', 'yes'), ('openssl','builtin'), #use builtin openssl @@ -107,13 +107,14 @@ def configure(env): elif env["target"] == "release_debug": env.Append(CCFLAGS=['-Os', '-ffast-math', '-DNS_BLOCK_ASSERTIONS=1','-Wall','-DDEBUG_ENABLED']) env.Append(LINKFLAGS=['-Os', '-ffast-math']) + env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ENABLED']) env['OBJSUFFIX'] = "_opt"+env['OBJSUFFIX'] env['LIBSUFFIX'] = "_opt"+env['LIBSUFFIX'] elif (env["target"]=="debug"): env.Append(CCFLAGS=['-D_DEBUG', '-DDEBUG=1', '-gdwarf-2', '-Wall', '-O0', '-DDEBUG_ENABLED']) - env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC']) + env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ENABLED']) elif (env["target"]=="profile"): diff --git a/platform/iphone/globals/global_defaults.cpp b/platform/iphone/globals/global_defaults.cpp index 63463ab366..a4929c57dc 100644 --- a/platform/iphone/globals/global_defaults.cpp +++ b/platform/iphone/globals/global_defaults.cpp @@ -6,6 +6,7 @@ void register_iphone_global_defaults() { GLOBAL_DEF("rasterizer.iOS/use_fragment_lighting",false); + GLOBAL_DEF("rasterizer.iOS/fp16_framebuffer",false); GLOBAL_DEF("display.iOS/driver","GLES2"); Globals::get_singleton()->set_custom_property_info("display.iOS/driver",PropertyInfo(Variant::STRING,"display.iOS/driver",PROPERTY_HINT_ENUM,"GLES1,GLES2")); } |