From fa6070073ceabdde8778ae2923454dc18e897e25 Mon Sep 17 00:00:00 2001 From: David Korth Date: Sun, 23 Oct 2016 22:50:16 -0400 Subject: [PATCH] [win32] resource.rc: Fix RP_VERSION_DEVEL error in non-development releases. config.version.h.in: Always define RP_VERSION_DEVEL. For non-development releases, it will be set to 0. --- src/config.version.h.in | 2 -- src/win32/resource.rc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/config.version.h.in b/src/config.version.h.in index 020ec33cf7..e68aa58e24 100644 --- a/src/config.version.h.in +++ b/src/config.version.h.in @@ -27,9 +27,7 @@ #define RP_VERSION_MAJOR @VERSION_MAJOR@ #define RP_VERSION_MINOR @VERSION_MINOR@ #define RP_VERSION_PATCH @VERSION_PATCH@ -#if @VERSION_DEVEL@ != 0 #define RP_VERSION_DEVEL @VERSION_DEVEL@ -#endif #define RP_VERSION_STRING "@VERSION_STRING@" #endif /* __ROMPROPERTIES_CONFIG_VERSION_H__ */ diff --git a/src/win32/resource.rc b/src/win32/resource.rc index db69beaced..091e387989 100644 --- a/src/win32/resource.rc +++ b/src/win32/resource.rc @@ -62,7 +62,7 @@ ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "rom-properties.dll.manifest" #else # define RP_VS_FF_DEBUG 0 #endif -#ifdef RP_VERSION_DEVEL +#if RP_VERSION_DEVEL != 0 # define RP_VS_FF_PRERELEASE VS_FF_PRERELEASE #else # define RP_VS_FF_PRERELEASE 0