maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Juan Linietsky 2014-02-26 14:26:19 -03:00
parent 768fc7ec81 a9aae3000f
commit a65edb4caa
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SConstruct
View file

@ -173,6 +173,17 @@ for p in platform_list:
env['CCFLAGS'] = ''
env.Append(CCFLAGS=string.split(str(CCFLAGS)))
CFLAGS = env.get('CFLAGS', '')
env['CFLAGS'] = ''
env.Append(CFLAGS=string.split(str(CFLAGS)))
LINKFLAGS = env.get('LINKFLAGS', '')
env['LINKFLAGS'] = ''
env.Append(LINKFLAGS=string.split(str(LINKFLAGS)))
detect.configure(env)
env['platform'] = p
if not env.has_key('platform_libsuffix'):

4
platform/windows/detect.py
View file

@ -129,8 +129,8 @@ def configure(env):
else:
VC_PATH=""
env.Append(CCFLAGS=["/I"+VC_PATH+"/Include"])
env.Append(LIBPATH=[VC_PATH+"/Lib"])
env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")])
env.Append(LIBPATH=[p for p in os.getenv("LIB").split(";")])
env.Append(CCFLAGS=["/I"+DIRECTX_PATH+"/Include"])
env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"])
env['ENV'] = os.environ;

3
tools/editor/plugins/spatial_editor_plugin.cpp
View file

@ -1407,6 +1407,9 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
} break;
case KEY_F: {
_menu_option(VIEW_CENTER_TO_SELECTION);
} break;
}

2
tools/editor/scenes_dock.cpp
View file

@ -181,7 +181,7 @@ void ScenesDock::_instance_pressed() {
if (!sel)
return;
String path = sel->get_metadata(0);
emit_signal("instance","res://"+path);
emit_signal("instance",path);
}
void ScenesDock::_open_pressed(){