mirror of
https://github.com/godotengine/godot
synced 2024-09-05 19:19:43 +00:00
Merge pull request #92325 from Repiteo/scons/res-race-condition-fix
SCons: Fix `RES` race condition
This commit is contained in:
commit
576d9a5c12
|
@ -50,6 +50,7 @@ def arrange_program_clean(prog):
|
|||
res_file = "godot_res.rc"
|
||||
res_target = "godot_res" + env["OBJSUFFIX"]
|
||||
res_obj = env.RES(res_target, res_file)
|
||||
env.Depends(res_obj, "#core/version_generated.gen.h")
|
||||
|
||||
env.add_source_files(sources, common_win)
|
||||
sources += res_obj
|
||||
|
@ -63,6 +64,7 @@ if env["windows_subsystem"] == "gui":
|
|||
res_wrap_file = "godot_res_wrap.rc"
|
||||
res_wrap_target = "godot_res_wrap" + env["OBJSUFFIX"]
|
||||
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:
|
||||
env_wrap.Append(LINKFLAGS=["/SUBSYSTEM:CONSOLE"])
|
||||
|
|
Loading…
Reference in a new issue