diff options
| author | Juan Linietsky | 2015-11-24 10:42:05 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-11-24 10:42:05 -0300 |
| commit | ccd40f76e8975b679619eb3591eb56376e82a6b3 (patch) | |
| tree | 9b6e4027c1c6bfdae82c2df54f1d9eb09d75ea43 /platform/windows | |
| parent | 85eedffbc77d9bdd92c8851aea09146feaf2d843 (diff) | |
| download | godot-ccd40f76e8975b679619eb3591eb56376e82a6b3.tar.gz godot-ccd40f76e8975b679619eb3591eb56376e82a6b3.tar.zst godot-ccd40f76e8975b679619eb3591eb56376e82a6b3.zip | |
-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
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/SCsub | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/windows/SCsub b/platform/windows/SCsub index 1fa793e2d..f98c1b01f 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"]) |