diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-01 10:54:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 10:54:15 +0200 |
| commit | df73d26314382829e4a7668bc254d7e11bc31f7d (patch) | |
| tree | d264103f213511264d0ef241baefddc00d425cd5 | |
| parent | 7028efd1ce32e803d261ae13a2799b7af5c299d6 (diff) | |
| parent | d4045d835f109bde856afc19fccad6cbad736ec1 (diff) | |
Merge pull request #21644 from elasota/fix-vs-res
Fix bad res file include in VS project
| -rw-r--r-- | platform/windows/SCsub | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/platform/windows/SCsub b/platform/windows/SCsub index 53ed3bf887..586533e817 100644 --- a/platform/windows/SCsub +++ b/platform/windows/SCsub @@ -7,6 +7,7 @@ from platform_methods import run_in_subprocess import platform_windows_builders common_win = [ + "godot_win.cpp", "context_gl_win.cpp", "crash_handler_win.cpp", "os_windows.cpp", @@ -17,17 +18,17 @@ common_win = [ "windows_terminal_logger.cpp" ] -restarget = "godot_res" + env["OBJSUFFIX"] +res_file = 'godot_res.rc' -obj = env.RES(restarget, 'godot_res.rc') +res_target = "godot_res" + env["OBJSUFFIX"] -common_win.append(obj) +res_obj = env.RES(res_target, res_file) -prog = env.add_program('#bin/godot', ['godot_win.cpp'] + common_win, PROGSUFFIX=env["PROGSUFFIX"]) +prog = env.add_program('#bin/godot', common_win + res_obj, PROGSUFFIX=env["PROGSUFFIX"]) # Microsoft Visual Studio Project Generation if env['vsproj']: - env.vs_srcs = env.vs_srcs + ["platform/windows/godot_win.cpp"] + env.vs_srcs = env.vs_srcs + ["platform/windows/" + res_file] for x in common_win: env.vs_srcs = env.vs_srcs + ["platform/windows/" + str(x)] |