mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues 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-09 18:52:47 -03:00
commit 4e8dcc8938
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/unix/os_unix.cpp
View File

@ -226,7 +226,8 @@ uint64_t OS_Unix::get_unix_time() const {
uint64_t OS_Unix::get_system_time_msec() const { 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);
uint64_t msec = tv_now.tv_usec/1000; uint64_t msec = tv_now.tv_usec/1000;
return msec; return msec;
} }

1
main/main.cpp
View File

@ -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_custom_pos=Point2(x,y);
init_use_custom_pos=true; init_use_custom_pos=true;
force_res=true;
N=I->next()->next(); N=I->next()->next();
} else { } else {

2
platform/iphone/SCsub
View File

@ -34,5 +34,5 @@ obj = env_ios.Object('godot_iphone.cpp')
prog = None prog = None
prog = env_ios.Program('#bin/godot', [obj] + iphone_lib) 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) env.AddPostAction(prog, action)

11
platform/iphone/detect.py
View File

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