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

drivers/unix/os_unix.cpp

@@ -226,7 +226,8 @@ uint64_t OS_Unix::get_unix_time() const {
 uint64_t OS_Unix::get_system_time_msec() const {
 	struct timeval tv_now;
 	gettimeofday(&tv_now, NULL);
-	localtime(&tv_now.tv_usec);
+	//localtime(&tv_now.tv_usec);
+	localtime((const long *)&tv_now.tv_usec);
 	uint64_t msec = tv_now.tv_usec/1000;
 	return msec;
 }

main/main.cpp

@@ -335,7 +335,6 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 
 				init_custom_pos=Point2(x,y);
 				init_use_custom_pos=true;
-				force_res=true;
 
 				N=I->next()->next();
 			} else {

platform/iphone/SCsub

@@ -34,5 +34,5 @@ obj = env_ios.Object('godot_iphone.cpp')
 
 prog = None
 prog = env_ios.Program('#bin/godot', [obj] + iphone_lib)
-action = "dsymutil "+File(prog)[0].path+" -o " + File(prog)[0].path + ".dSYM"
+action = "$IPHONEPATH/usr/bin/dsymutil "+File(prog)[0].path+" -o " + File(prog)[0].path + ".dSYM"
 env.AddPostAction(prog, action)

platform/iphone/detect.py

@@ -11,7 +11,8 @@ def get_name():
 def can_build():
 
 	import sys
-	if sys.platform == 'darwin':
+	import os
+	if sys.platform == 'darwin' or os.environ.has_key("OSXCROSS_IOS"):
 		return True
 
 	return False
@@ -28,6 +29,7 @@ def get_opts():
 		('ios_gles22_override', 'Force GLES2.0 on iOS', 'yes'),
 		('ios_appirater', 'Enable Appirater', 'no'),
 		('ios_exceptions', 'Use exceptions when compiling on playbook', 'yes'),
+		('ios_triple', 'Triple for ios toolchain', ''),
 	]
 
 def get_flags():
@@ -48,9 +50,10 @@ def configure(env):
 
 #	env['CC'] = '$IPHONEPATH/Developer/usr/bin/gcc'
 #	env['CXX'] = '$IPHONEPATH/Developer/usr/bin/g++'
-	env['CC'] = '$IPHONEPATH/usr/bin/clang'
-	env['CXX'] = '$IPHONEPATH/usr/bin/clang++'
-	env['AR'] = 'ar'
+	env['CC'] = '$IPHONEPATH/usr/bin/${ios_triple}clang'
+	env['CXX'] = '$IPHONEPATH/usr/bin/${ios_triple}clang++'
+	env['AR'] = '$IPHONEPATH/usr/bin/${ios_triple}ar'
+	env['RANLIB'] = '$IPHONEPATH/usr/bin/${ios_triple}ranlib'
 
 	import string
 	if (env["bits"]=="64"):