From e3fa6f4224e0d706df3ee262ae41cfb0deadc593 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Thu, 21 Nov 2024 01:10:13 +0100 Subject: [PATCH] Fix version number in the generated Windows resource --- CMakeLists.txt | 2 +- res/melon.rc.in | 4 ++-- src/frontend/qt_sdl/CMakeLists.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02a0e420..c54b6450 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ if (USE_VCPKG) endif() project(melonDS - VERSION 1.0.0 + VERSION 1.0 DESCRIPTION "DS emulator, sorta" HOMEPAGE_URL "https://melonds.kuribo64.net" LANGUAGES C CXX) diff --git a/res/melon.rc.in b/res/melon.rc.in index eb437b32..299933cb 100644 --- a/res/melon.rc.in +++ b/res/melon.rc.in @@ -6,8 +6,8 @@ //include version information in .exe, modify these values to match your needs 1 VERSIONINFO -FILEVERSION ${melonDS_VERSION_MAJOR},${melonDS_VERSION_MINOR},${melonDS_VERSION_PATCH},0 -PRODUCTVERSION ${melonDS_VERSION_MAJOR},${melonDS_VERSION_MINOR},${melonDS_VERSION_PATCH},0 +FILEVERSION ${MELON_RC_VERSION} +PRODUCTVERSION ${MELON_RC_VERSION} FILETYPE VFT_APP { BLOCK "StringFileInfo" diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt index fa1fafd8..c2252b21 100644 --- a/src/frontend/qt_sdl/CMakeLists.txt +++ b/src/frontend/qt_sdl/CMakeLists.txt @@ -190,6 +190,7 @@ if (WIN32) target_compile_definitions(melonDS PRIVATE WIN32_PORTABLE) endif() + string(REPLACE . , MELON_RC_VERSION ${melonDS_VERSION}) configure_file("${CMAKE_SOURCE_DIR}/res/melon.rc.in" "${CMAKE_BINARY_DIR}/res/melon.rc") target_sources(melonDS PUBLIC "${CMAKE_BINARY_DIR}/res/melon.rc") target_include_directories(melonDS PRIVATE "${CMAKE_BINARY_DIR}/res")