6 files changed, 21 insertions, 25 deletions
diff --git a/platform/iphone/SCsub b/platform/iphone/SCsub
index 550dfdd7d6..6b5f30dc41 100644
--- a/platform/iphone/SCsub
+++ b/platform/iphone/SCsub
@@ -17,7 +17,7 @@ iphone_lib = [
 ]
 
 env_ios = env.Clone()
-ios_lib = env_ios.Library('iphone', iphone_lib)
+ios_lib = env_ios.add_library('iphone', iphone_lib)
 
 def combine_libs(target=None, source=None, env=None):
     lib_path = target[0].srcnode().abspath
diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm
index 8f2893e69e..b591f80aa7 100644
--- a/platform/iphone/app_delegate.mm
+++ b/platform/iphone/app_delegate.mm
@@ -564,7 +564,7 @@ static int frame_count = 0;
 			MainLoop::NOTIFICATION_OS_MEMORY_WARNING);
 };
 
-- (void)applicationDidFinishLaunching:(UIApplication *)application {
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
 	printf("**************** app delegate init\n");
 	CGRect rect = [[UIScreen mainScreen] bounds];
@@ -671,6 +671,7 @@ static int frame_count = 0;
 												  isAdvertisingTrackingEnabled]];
 
 #endif
+	return TRUE;
 };
 
 - (void)applicationWillTerminate:(UIApplication *)application {
diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp
index 8ab1cbc435..1833bdf2b3 100644
--- a/platform/iphone/export/export.cpp
+++ b/platform/iphone/export/export.cpp
@@ -37,7 +37,7 @@
 #include "io/zip_io.h"
 #include "os/file_access.h"
 #include "os/os.h"
-#include "platform/osx/logo.gen.h"
+#include "platform/iphone/logo.gen.h"
 #include "project_settings.h"
 #include "string.h"
 #include "version.h"
@@ -69,8 +69,9 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
 		String name;
 		bool is_default;
 
-		ExportArchitecture()
-			: name(""), is_default(false) {
+		ExportArchitecture() :
+				name(""),
+				is_default(false) {
 		}
 
 		ExportArchitecture(String p_name, bool p_is_default) {
@@ -453,8 +454,9 @@ struct CodesignData {
 	const Ref<EditorExportPreset> &preset;
 	bool debug;
 
-	CodesignData(const Ref<EditorExportPreset> &p_preset, bool p_debug)
-		: preset(p_preset), debug(p_debug) {
+	CodesignData(const Ref<EditorExportPreset> &p_preset, bool p_debug) :
+			preset(p_preset),
+			debug(p_debug) {
 	}
 };
 
@@ -972,14 +974,13 @@ bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset
 	if (!err.empty())
 		r_error = err;
 
+	r_missing_templates = !valid;
 	return valid;
 }
 
 EditorExportPlatformIOS::EditorExportPlatformIOS() {
 
-	///@TODO need to create the correct logo
-	//  Ref<Image> img = memnew(Image(_iphone_logo));
-	Ref<Image> img = memnew(Image(_osx_logo));
+	Ref<Image> img = memnew(Image(_iphone_logo));
 	logo.instance();
 	logo->create_from_image(img);
 }
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp
index fbe3bd310d..1c7f41b464 100644
--- a/platform/iphone/os_iphone.cpp
+++ b/platform/iphone/os_iphone.cpp
@@ -117,7 +117,7 @@ void OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_
 	*/
 
 	visual_server->init();
-	//	visual_server->cursor_set_visible(false, 0);
+	//visual_server->cursor_set_visible(false, 0);
 
 	// reset this to what it should be, it will have been set to 0 after visual_server->init() is called
 	RasterizerStorageGLES3::system_fbo = gl_view_base_fb;
@@ -127,14 +127,6 @@ void OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_
 
 	input = memnew(InputDefault);
 
-/*
-#ifdef IOS_SCORELOOP_ENABLED
-	scoreloop = memnew(ScoreloopIOS);
-	Engine::get_singleton()->add_singleton(Engine::Singleton("Scoreloop", scoreloop));
-	scoreloop->connect();
-#endif
-	*/
-
 #ifdef GAME_CENTER_ENABLED
 	game_center = memnew(GameCenter);
 	Engine::get_singleton()->add_singleton(Engine::Singleton("GameCenter", game_center));
@@ -149,7 +141,7 @@ void OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_
 #ifdef ICLOUD_ENABLED
 	icloud = memnew(ICloud);
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ICloud", icloud));
-//icloud->connect();
+	//icloud->connect();
 #endif
 	Engine::get_singleton()->add_singleton(Engine::Singleton("iOS", memnew(iOS)));
 };
@@ -394,12 +386,12 @@ void OSIPhone::alert(const String &p_alert, const String &p_title) {
 	iOS::alert(utf8_alert.get_data(), utf8_title.get_data());
 }
 
-Error OSIPhone::open_dynamic_library(const String p_path, void *&p_library_handle) {
+Error OSIPhone::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path) {
 	if (p_path.length() == 0) {
 		p_library_handle = RTLD_SELF;
 		return OK;
 	}
-	return OS_Unix::open_dynamic_library(p_path, p_library_handle);
+	return OS_Unix::open_dynamic_library(p_path, p_library_handle, p_also_set_library_path);
 }
 
 Error OSIPhone::close_dynamic_library(void *p_library_handle) {
diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h
index 1ef673765a..3f989b49be 100644
--- a/platform/iphone/os_iphone.h
+++ b/platform/iphone/os_iphone.h
@@ -155,7 +155,7 @@ public:
 
 	virtual void alert(const String &p_alert, const String &p_title = "ALERT!");
 
-	virtual Error open_dynamic_library(const String p_path, void *&p_library_handle);
+	virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false);
 	virtual Error close_dynamic_library(void *p_library_handle);
 	virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false);
 
diff --git a/platform/iphone/power_iphone.cpp b/platform/iphone/power_iphone.cpp
index 055d31ef0a..03afdb15f9 100644
--- a/platform/iphone/power_iphone.cpp
+++ b/platform/iphone/power_iphone.cpp
@@ -58,8 +58,10 @@ int PowerIphone::get_power_percent_left() {
 	}
 }
 
-PowerIphone::PowerIphone()
-	: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
+PowerIphone::PowerIphone() :
+		nsecs_left(-1),
+		percent_left(-1),
+		power_state(OS::POWERSTATE_UNKNOWN) {
 	// TODO Auto-generated constructor stub
 }