Fixes from Ariel

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)

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;
 };
 

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"):
 

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"));
 }