From 5596db274ee44ef1da0d32e26cb5b87dd67181b9 Mon Sep 17 00:00:00 2001 From: Alcaro Date: Sun, 28 Apr 2019 22:43:25 +0200 Subject: [PATCH] Deduplicate the version number a bit --- Makefile | 2 +- flips.h | 5 +++++ flips.rc | 13 ++++++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 690b115..73d0d48 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ clean: | obj ifeq ($(TARGET),windows) XFILES += obj/rc.o -obj/rc.o: flips.rc | obj +obj/rc.o: flips.rc flips.h | obj windres flips.rc obj/rc.o endif diff --git a/flips.h b/flips.h index 49fd073..6eeb0b5 100644 --- a/flips.h +++ b/flips.h @@ -35,6 +35,11 @@ //#endif #define flipsversion "Floating IPS v1.40-pre" +#define flips_rc_vermajor 1 +#define flips_rc_verminor 4 +#define flips_rc_verpatch 0 +#define flips_rc_verstr "1.4.0.0" +#define flips_rc_copyrightstr "\xA9 2013-2019 Alcaro" #if defined(FLIPS_WINDOWS) diff --git a/flips.rc b/flips.rc index c4492f6..4871bce 100644 --- a/flips.rc +++ b/flips.rc @@ -1,5 +1,4 @@ -#include - +#include "flips.h" 0 ICON DISCARDABLE "flips.ico" 1 ICON DISCARDABLE "ips.ico" @@ -7,8 +6,8 @@ 1 24 "flips.Manifest" VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,4,0,0 -PRODUCTVERSION 1,4,0,0 +FILEVERSION flips_rc_vermajor,flips_rc_verminor,flips_rc_verpatch,0 +PRODUCTVERSION flips_rc_vermajor,flips_rc_verminor,flips_rc_verpatch,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 //VS_FF_DEBUG VS_FF_PATCHED VS_FF_PRERELEASE VS_FF_PRIVATEBUILD VS_FF_SPECIALBUILD VS_FFI_FILEFLAGSMASK @@ -22,12 +21,12 @@ BEGIN BEGIN VALUE "CompanyName", "Alcaro" VALUE "FileDescription", "Flips Patch Utility" - VALUE "FileVersion", "1.4.0.0" + VALUE "FileVersion", flips_rc_verstr VALUE "InternalName", "Floating IPS" - VALUE "LegalCopyright", "©2013-2018 Alcaro" + VALUE "LegalCopyright", flips_rc_copyrightstr VALUE "OriginalFilename", "flips.exe" VALUE "ProductName", "Floating IPS" - VALUE "ProductVersion", "1.4.0.0" + VALUE "ProductVersion", flips_rc_verstr END END END