godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-31 18:41:20 +00:00
Code Releases Wiki Activity

Merge pull request #112116 from bruvzg/sep_res_templ

Browse Source 
[Windows] Use separate resource files for export templates.
This commit is contained in:
Rémi Verschelde
2025-12-18 14:23:21 +01:00
parent bb07fd927f 6dfd822390
commit b72679bcc5
3 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/windows/SCsub
View File

@@ -69,8 +69,12 @@ def arrange_program_clean(prog):
env["BUILDERS"]["RES"].emitter = redirect_emitter env["BUILDERS"]["RES"].emitter = redirect_emitter
res_file = "godot_res.rc" if env.editor_build:
res_target = "godot_res" + env["OBJSUFFIX"] res_file = "godot_res.rc"
res_target = "godot_res" + env["OBJSUFFIX"]
else:
res_file = "godot_res_template.rc"
res_target = "godot_res_template" + 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.Depends(res_obj, "#core/version_generated.gen.h")
@@ -94,8 +98,12 @@ if env.msvc:
# Build console wrapper app. # Build console wrapper app.
if env["windows_subsystem"] == "gui": if env["windows_subsystem"] == "gui":
res_wrap_file = "godot_res_wrap.rc" if env.editor_build:
res_wrap_target = "godot_res_wrap" + env["OBJSUFFIX"] res_wrap_file = "godot_res_wrap.rc"
res_wrap_target = "godot_res_wrap" + env["OBJSUFFIX"]
else:
res_wrap_file = "godot_res_wrap_template.rc"
res_wrap_target = "godot_res_wrap_template" + 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") env_wrap.Depends(res_wrap_obj, "#core/version_generated.gen.h")

28
platform/windows/godot_res_template.rc Normal file
View File

@@ -0,0 +1,28 @@
#include "core/version.h"
#ifndef RT_MANIFEST
#define RT_MANIFEST 24
#endif
GODOT_ICON ICON platform/windows/godot.ico
1 RT_MANIFEST "platform/windows/godot.manifest"
1 VERSIONINFO
FILEVERSION GODOT_VERSION_MAJOR,GODOT_VERSION_MINOR,GODOT_VERSION_PATCH,0
PRODUCTVERSION GODOT_VERSION_MAJOR,GODOT_VERSION_MINOR,GODOT_VERSION_PATCH,0
FILEOS 4
FILETYPE 1
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", GODOT_VERSION_NAME
VALUE "FileVersion", GODOT_VERSION_NUMBER
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END

28
platform/windows/godot_res_wrap_template.rc Normal file
View File

@@ -0,0 +1,28 @@
#include "core/version.h"
#ifndef RT_MANIFEST
#define RT_MANIFEST 24
#endif
GODOT_ICON ICON platform/windows/godot_console.ico
1 RT_MANIFEST "platform/windows/godot.manifest"
1 VERSIONINFO
FILEVERSION GODOT_VERSION_MAJOR,GODOT_VERSION_MINOR,GODOT_VERSION_PATCH,0
PRODUCTVERSION GODOT_VERSION_MAJOR,GODOT_VERSION_MINOR,GODOT_VERSION_PATCH,0
FILEOS 4
FILETYPE 1
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", GODOT_VERSION_NAME " (Console)"
VALUE "FileVersion", GODOT_VERSION_NUMBER
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END