From bb5bfda5c6cc92649716ff39290dbda3a3a82a86 Mon Sep 17 00:00:00 2001
From: refractionpcsx2 <refraction@gmail.com>
Date: Tue, 31 Aug 2021 18:09:38 +0100
Subject: [PATCH] App: Link in version number information to exe version
 information

---
 pcsx2/CMakeLists.txt   |  1 +
 pcsx2/PCSX2.rc         | 23 +++++++++++++----------
 pcsx2/SysForwardDefs.h | 24 +++++++++++++++++++++---
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index c66584c512..d63669e0de 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -73,6 +73,7 @@ endif()
 if(WIN32)
 	# Resources
 	target_sources(PCSX2 PRIVATE
+		PCSX2.rc
 		GS/GS.rc
 		PAD/Windows/PAD.rc
 		SPU2/Windows/SPU2.rc
diff --git a/pcsx2/PCSX2.rc b/pcsx2/PCSX2.rc
index 692e3d4cf7..aaadf31bcc 100644
--- a/pcsx2/PCSX2.rc
+++ b/pcsx2/PCSX2.rc
@@ -1,6 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
+#include "SysForwardDefs.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -29,7 +30,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "resource.h\r\n"
+    "SysForwardDefs.h\0"
 END
 
 2 TEXTINCLUDE 
@@ -49,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,7,0,0
- PRODUCTVERSION 1,7,0,0
+ FILEVERSION        VER_FILE_VERSION
+ PRODUCTVERSION     VER_PRODUCT_VERSION
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -63,14 +65,15 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "080904b0"
+        BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "PCSX2"
-            VALUE "FileDescription", "PCSX2 PS2 Emulator"
-            VALUE "FileVersion", "1.7.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2021"
-            VALUE "ProductName", "PCSX2"
-            VALUE "ProductVersion", "1.7.0.0"
+            VALUE "FileDescription", VER_FILE_DESCRIPTION_STR "\0"
+            VALUE "FileVersion", VER_FILE_VERSION_STR "\0"
+            VALUE "InternalName", VER_INTERNAL_NAME_STR "\0"
+            VALUE "LegalCopyright", VER_COPYRIGHT_STR "\0"
+            VALUE "OriginalFilename", VER_ORIGINAL_FILENAME_STR "\0"
+            VALUE "ProductName", VER_PRODUCTNAME_STR "\0"
+            VALUE "ProductVersion", VER_PRODUCT_VERSION_STR "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/pcsx2/SysForwardDefs.h b/pcsx2/SysForwardDefs.h
index e38e8bf8d6..48f8ef18c3 100644
--- a/pcsx2/SysForwardDefs.h
+++ b/pcsx2/SysForwardDefs.h
@@ -15,9 +15,27 @@
 
 #pragma once
 
-static const int PCSX2_VersionHi	= 1;
-static const int PCSX2_VersionMid	= 7;
-static const int PCSX2_VersionLo	= 0;
+#define PCSX2_VersionHi     1
+#define PCSX2_VersionMid    7
+#define PCSX2_VersionLo     0
+
+#define STRINGIZE2(s) #s
+#define STRINGIZE(s) STRINGIZE2(s)
+
+#define VER_FILE_DESCRIPTION_STR    "PCSX2 PS2 Emulator"
+#define VER_FILE_VERSION            PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, 0
+#define VER_FILE_VERSION_STR        STRINGIZE(PCSX2_VersionHi)        \
+                                    "." STRINGIZE(PCSX2_VersionMid)    \
+                                    "." STRINGIZE(PCSX2_VersionLo) \
+                                    "." STRINGIZE(0)    \
+
+#define VER_PRODUCTNAME_STR         "PCSX2"
+#define VER_PRODUCT_VERSION         VER_FILE_VERSION
+#define VER_PRODUCT_VERSION_STR     VER_FILE_VERSION_STR
+#define VER_ORIGINAL_FILENAME_STR   VER_PRODUCTNAME_STR ".exe"
+#define VER_INTERNAL_NAME_STR       VER_ORIGINAL_FILENAME_STR
+#define VER_COPYRIGHT_STR           "Copyright (C) 2021"
+
 static const bool PCSX2_isReleaseVersion = 0;
 
 class SysCoreThread;