From ccd40f76e8975b679619eb3591eb56376e82a6b3 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 24 Nov 2015 10:42:05 -0300 Subject: -work in progress resourceparser and .tscn parser. Still non-functional -fixed theora so it can compile theoralib but not theora -fixed generation of windows icon in .rc, which didn't previously work in 32 bits --- platform/windows/SCsub | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'platform/windows') diff --git a/platform/windows/SCsub b/platform/windows/SCsub index 1fa793e2de..f98c1b01ff 100644 --- a/platform/windows/SCsub +++ b/platform/windows/SCsub @@ -11,11 +11,11 @@ common_win=[ "stream_peer_winsock.cpp", ] -env.RES('godot_res.rc') -if env["is_mingw"]: - common_win.append("godot_res.o") -else: - common_win.append("godot_res.res") +restarget="godot_res"+env["OBJSUFFIX"] + +obj = env.RES(restarget,'godot_res.rc') + +common_win.append(obj) env.Program('#bin/godot',['godot_win.cpp']+common_win,PROGSUFFIX=env["PROGSUFFIX"]) -- cgit v1.2.3