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

drivers/unix/os_unix.cpp

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

platform/iphone/detect.py

@@ -37,6 +37,7 @@ def get_flags():
 	return [
 		('tools', 'no'),
 		('webp', 'yes'),
+		("theora","no"),       		
 		('openssl','builtin'), #use builtin openssl
 	]
 

platform/osx/detect.py

@@ -31,6 +31,7 @@ def get_flags():
 	('opengl', 'no'),
 	('legacygl', 'yes'),
 	('builtin_zlib', 'no'),
+        ("theora","no"),       	
 	('freetype','builtin'), #use builtin freetype
 	]