commit c7cde80ed8903768d81567aca781ee6acbb05a40
Author: Michael Day <contact@michaelcday.com>
AuthorDate: Sat Aug 20 17:18:00 2022 -0400
Commit: Michael Day <contact@michaelcday.com>
CommitDate: Sat Aug 20 17:18:00 2022 -0400
Update resource files for game-specific icons
---
CMakeLists.txt | 5 ++++-
configure.ac | 5 ++++-
src/CMakeLists.txt | 8 ++++----
src/Makefile.am | 8 ++++----
src/{resource.rc.in => doom-res.rc.in} | 0
src/heretic-res.rc.in | 30 ++++++++++++++++++++++++++++++
src/hexen-res.rc.in | 30 ++++++++++++++++++++++++++++++
src/strife-res.rc.in | 30 ++++++++++++++++++++++++++++++
8 files changed, 106 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f1eed09..07db7df5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,9 +75,12 @@ set(PROGRAM_PREFIX "${PROGRAM_SPREFIX}-")
configure_file(cmake/config.h.cin config.h)
-configure_file(src/resource.rc.in src/resource.rc)
+configure_file(src/doom-res.rc.in src/doom-res.rc)
+configure_file(src/heretic-res.rc.in src/heretic-res.rc)
+configure_file(src/hexen-res.rc.in src/hexen-res.rc)
configure_file(src/setup-res.rc.in src/setup-res.rc)
configure_file(src/setup/setup-manifest.xml.in src/setup/setup-manifest.xml)
+configure_file(src/strife-res.rc.in src/strife-res.rc)
foreach(SUBDIR textscreen opl pcsound src)
add_subdirectory("${SUBDIR}")
diff --git a/configure.ac b/configure.ac
index fd5d8bce..466c2f53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,21 +235,24 @@ pkg/osx/Info.plist
rpm.spec
data/Makefile
src/Makefile
+src/doom-res.rc
src/Doom.metainfo.xml
src/Doom.desktop
src/Doom_Screensaver.desktop
src/doom/Makefile
+src/heretic-res.rc
src/Heretic.metainfo.xml
src/Heretic.desktop
src/heretic/Makefile
+src/hexen-res.rc
src/Hexen.metainfo.xml
src/Hexen.desktop
src/hexen/Makefile
-src/resource.rc
src/setup-res.rc
src/setup/Makefile
src/setup/Setup.desktop
src/setup/setup-manifest.xml
+src/strife-res.rc
src/Strife.metainfo.xml
src/Strife.desktop
src/strife/Makefile
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bbb87764..4a11c9df 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -142,7 +142,7 @@ if(WIN32)
endif()
if(WIN32)
- add_executable("${PROGRAM_PREFIX}doom" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/resource.rc")
+ add_executable("${PROGRAM_PREFIX}doom" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/doom-res.rc")
else()
add_executable("${PROGRAM_PREFIX}doom" ${SOURCE_FILES_WITH_DEH})
endif()
@@ -156,7 +156,7 @@ if(MSVC)
endif()
if(WIN32)
- add_executable("${PROGRAM_PREFIX}heretic" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/resource.rc")
+ add_executable("${PROGRAM_PREFIX}heretic" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/heretic-res.rc")
else()
add_executable("${PROGRAM_PREFIX}heretic" ${SOURCE_FILES_WITH_DEH})
endif()
@@ -170,7 +170,7 @@ if(MSVC)
endif()
if(WIN32)
- add_executable("${PROGRAM_PREFIX}hexen" WIN32 ${SOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/resource.rc")
+ add_executable("${PROGRAM_PREFIX}hexen" WIN32 ${SOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/hexen-res.rc")
else()
add_executable("${PROGRAM_PREFIX}hexen" ${SOURCE_FILES})
endif()
@@ -184,7 +184,7 @@ if(MSVC)
endif()
if(WIN32)
- add_executable("${PROGRAM_PREFIX}strife" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/resource.rc")
+ add_executable("${PROGRAM_PREFIX}strife" WIN32 ${SOURCE_FILES_WITH_DEH} "${CMAKE_CURRENT_BINARY_DIR}/strife-res.rc")
else()
add_executable("${PROGRAM_PREFIX}strife" ${SOURCE_FILES_WITH_DEH})
endif()
diff --git a/src/Makefile.am b/src/Makefile.am
index a3e7f34b..0f99efea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -140,7 +140,7 @@ EXTRA_LIBS = \
@SDLNET_LIBS@
if HAVE_WINDRES
-@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc
+@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) doom-res.rc
else
@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH)
endif
@@ -148,7 +148,7 @@ endif
@PROGRAM_PREFIX@doom_LDADD = doom/libdoom.a $(EXTRA_LIBS)
if HAVE_WINDRES
-@PROGRAM_PREFIX@heretic_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc
+@PROGRAM_PREFIX@heretic_SOURCES=$(SOURCE_FILES_WITH_DEH) heretic-res.rc
else
@PROGRAM_PREFIX@heretic_SOURCES=$(SOURCE_FILES_WITH_DEH)
endif
@@ -156,7 +156,7 @@ endif
@PROGRAM_PREFIX@heretic_LDADD = heretic/libheretic.a $(EXTRA_LIBS)
if HAVE_WINDRES
-@PROGRAM_PREFIX@hexen_SOURCES=$(SOURCE_FILES) resource.rc
+@PROGRAM_PREFIX@hexen_SOURCES=$(SOURCE_FILES) hexen-res.rc
else
@PROGRAM_PREFIX@hexen_SOURCES=$(SOURCE_FILES)
endif
@@ -164,7 +164,7 @@ endif
@PROGRAM_PREFIX@hexen_LDADD = hexen/libhexen.a $(EXTRA_LIBS)
if HAVE_WINDRES
-@PROGRAM_PREFIX@strife_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc
+@PROGRAM_PREFIX@strife_SOURCES=$(SOURCE_FILES_WITH_DEH) strife-res.rc
else
@PROGRAM_PREFIX@strife_SOURCES=$(SOURCE_FILES_WITH_DEH)
endif
diff --git a/src/resource.rc.in b/src/doom-res.rc.in
similarity index 100%
rename from src/resource.rc.in
rename to src/doom-res.rc.in
diff --git a/src/heretic-res.rc.in b/src/heretic-res.rc.in
new file mode 100644
index 00000000..0cf43446
--- /dev/null
+++ b/src/heretic-res.rc.in
@@ -0,0 +1,30 @@
+1 ICON "@top_srcdir@/data/heretic.ico"
+
+#include <winuser.h>
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
+
+1 VERSIONINFO
+PRODUCTVERSION @WINDOWS_RC_VERSION@
+FILEVERSION @WINDOWS_RC_VERSION@
+FILETYPE 1
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "FileVersion", "@PACKAGE_VERSION@.0"
+ VALUE "FileDescription", "@PACKAGE_STRING@"
+ VALUE "InternalName", "@PACKAGE_TARNAME@"
+ VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
+ VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
+ VALUE "ProductName", "@PACKAGE_NAME@"
+ VALUE "ProductVersion", "@PACKAGE_VERSION@"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1252
+ }
+}
+
diff --git a/src/hexen-res.rc.in b/src/hexen-res.rc.in
new file mode 100644
index 00000000..b2b811b6
--- /dev/null
+++ b/src/hexen-res.rc.in
@@ -0,0 +1,30 @@
+1 ICON "@top_srcdir@/data/hexen.ico"
+
+#include <winuser.h>
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
+
+1 VERSIONINFO
+PRODUCTVERSION @WINDOWS_RC_VERSION@
+FILEVERSION @WINDOWS_RC_VERSION@
+FILETYPE 1
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "FileVersion", "@PACKAGE_VERSION@.0"
+ VALUE "FileDescription", "@PACKAGE_STRING@"
+ VALUE "InternalName", "@PACKAGE_TARNAME@"
+ VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
+ VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
+ VALUE "ProductName", "@PACKAGE_NAME@"
+ VALUE "ProductVersion", "@PACKAGE_VERSION@"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1252
+ }
+}
+
diff --git a/src/strife-res.rc.in b/src/strife-res.rc.in
new file mode 100644
index 00000000..ab9a2580
--- /dev/null
+++ b/src/strife-res.rc.in
@@ -0,0 +1,30 @@
+1 ICON "@top_srcdir@/data/strife.ico"
+
+#include <winuser.h>
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
+
+1 VERSIONINFO
+PRODUCTVERSION @WINDOWS_RC_VERSION@
+FILEVERSION @WINDOWS_RC_VERSION@
+FILETYPE 1
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "FileVersion", "@PACKAGE_VERSION@.0"
+ VALUE "FileDescription", "@PACKAGE_STRING@"
+ VALUE "InternalName", "@PACKAGE_TARNAME@"
+ VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
+ VALUE "LegalCopyright", "@PACKAGE_COPYRIGHT@. Licensed under @PACKAGE_LICENSE@"
+ VALUE "ProductName", "@PACKAGE_NAME@"
+ VALUE "ProductVersion", "@PACKAGE_VERSION@"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1252
+ }
+}
+