From b039d9d4d121dfe1a00f3b0946e53daf66cd1593 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Fri, 22 Sep 2023 01:56:10 +0200
Subject: [PATCH] add cnc-ddraw version to log

---
 cnc-ddraw.vcxproj         |  1 +
 cnc-ddraw.vcxproj.filters |  3 +++
 ddraw.rc                  | 11 +----------
 inc/version.h             | 16 ++++++++++++++++
 src/debug.c               |  3 +++
 5 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 inc/version.h

diff --git a/cnc-ddraw.vcxproj b/cnc-ddraw.vcxproj
index 6fa674b..1627aef 100644
--- a/cnc-ddraw.vcxproj
+++ b/cnc-ddraw.vcxproj
@@ -103,6 +103,7 @@
     <ClInclude Include="inc\screenshot.h" />
     <ClInclude Include="inc\config.h" />
     <ClInclude Include="inc\ddsurface.h" />
+    <ClInclude Include="inc\version.h" />
     <ClInclude Include="inc\wglext.h" />
     <ClInclude Include="inc\winapi_hooks.h" />
     <ClInclude Include="inc\wndproc.h" />
diff --git a/cnc-ddraw.vcxproj.filters b/cnc-ddraw.vcxproj.filters
index 39187f8..11979b2 100644
--- a/cnc-ddraw.vcxproj.filters
+++ b/cnc-ddraw.vcxproj.filters
@@ -266,6 +266,9 @@
     <ClInclude Include="inc\blt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="inc\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ddraw.rc">
diff --git a/ddraw.rc b/ddraw.rc
index 0d02eea..551bfc0 100644
--- a/ddraw.rc
+++ b/ddraw.rc
@@ -1,13 +1,4 @@
-#define str(s) #s
-#define ver_str(a,b,c,d) str(a) "." str(b) "." str(c) "." str(d)
-
-#define VERSION_MAJOR    5
-#define VERSION_MINOR    7
-#define VERSION_BUILD    0
-#define VERSION_REVISION 4
-
-#define VERSION          VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION
-#define VERSION_STRING   ver_str(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION)
+#include "inc/version.h"
 
 1 VERSIONINFO
 FILEVERSION VERSION
diff --git a/inc/version.h b/inc/version.h
new file mode 100644
index 0000000..6b065cf
--- /dev/null
+++ b/inc/version.h
@@ -0,0 +1,16 @@
+#ifndef VERSION_H
+#define VERSION_H
+
+#define str(s) #s
+#define ver_str(a,b,c,d) str(a) "." str(b) "." str(c) "." str(d)
+
+#define VERSION_MAJOR    5
+#define VERSION_MINOR    7
+#define VERSION_BUILD    0
+#define VERSION_REVISION 5
+
+#define VERSION          VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION
+#define VERSION_STRING   ver_str(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION)
+
+
+#endif
diff --git a/src/debug.c b/src/debug.c
index fb8419b..8ebeb12 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -7,6 +7,7 @@
 #include "wndproc.h"
 #include "debug.h"
 #include "hook.h"
+#include "version.h"
 
 
 double g_dbg_frame_time = 0;
@@ -103,6 +104,8 @@ void dbg_init()
         g_dbg_log_file = fopen("cnc-ddraw-1.log", "w");
         setvbuf(g_dbg_log_file, NULL, _IOLBF, 1024);
 
+        TRACE("cnc-ddraw version = %d.%d.%d.%d\n", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION);
+
         HKEY hkey;
         LONG status =
             RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0L, KEY_READ, &hkey);