godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCons: Fix `RES` race condition

This commit is contained in:
Thaddeus Crews 2024-05-24 12:44:44 -05:00
parent b7feebefab
commit 18fb492afe
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/windows/SCsub
View File

@ -50,6 +50,7 @@ def arrange_program_clean(prog):
res_file = "godot_res.rc" res_file = "godot_res.rc"
res_target = "godot_res" + env["OBJSUFFIX"] res_target = "godot_res" + env["OBJSUFFIX"]
res_obj = env.RES(res_target, res_file) res_obj = env.RES(res_target, res_file)
env.Depends(res_obj, "#core/version_generated.gen.h")
env.add_source_files(sources, common_win) env.add_source_files(sources, common_win)
sources += res_obj sources += res_obj
@ -63,6 +64,7 @@ if env["windows_subsystem"] == "gui":
res_wrap_file = "godot_res_wrap.rc" res_wrap_file = "godot_res_wrap.rc"
res_wrap_target = "godot_res_wrap" + env["OBJSUFFIX"] res_wrap_target = "godot_res_wrap" + env["OBJSUFFIX"]
res_wrap_obj = env_wrap.RES(res_wrap_target, res_wrap_file) res_wrap_obj = env_wrap.RES(res_wrap_target, res_wrap_file)
env_wrap.Depends(res_wrap_obj, "#core/version_generated.gen.h")
if env.msvc: if env.msvc:
env_wrap.Append(LINKFLAGS=["/SUBSYSTEM:CONSOLE"]) env_wrap.Append(LINKFLAGS=["/SUBSYSTEM:CONSOLE"])