godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Juan Linietsky 2015-09-10 20:31:34 -03:00
commit c7426717d3
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/unix/os_unix.cpp
View File

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

1
platform/iphone/detect.py
View File

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

1
platform/osx/detect.py
View File

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