diff options
| -rw-r--r-- | drivers/unix/os_unix.cpp | 4 | ||||
| -rw-r--r-- | platform/iphone/detect.py | 1 | ||||
| -rw-r--r-- | platform/osx/detect.py | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 05af7ee900..96f90e6be1 100644 --- a/drivers/unix/os_unix.cpp +++ b/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; } diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index e7a262a2bc..3864968d94 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -37,6 +37,7 @@ def get_flags(): return [ ('tools', 'no'), ('webp', 'yes'), + ("theora","no"), ('openssl','builtin'), #use builtin openssl ] diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 22cee0527e..4a20ca80c1 100644 --- a/platform/osx/detect.py +++ b/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 ] |