Fix Powershell NSI script now using quakever.h

Novum · Aug 2, 2024 · f09814e · f09814e
1 parent 0b060e4
commit f09814e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Packaging/Windows/createinstallers.ps1 b/Packaging/Windows/createinstallers.ps1
@@ -1,10 +1,12 @@
-$BaseVersionMatch=Select-String "^#define\s*VKQUAKE_VERSION\s*([0-9.]*)" "../../Quake/quakedef.h"
-$BaseVersion=$BaseVersionMatch.Matches.groups[1].value
-$PatchVersionMatch=Select-String "^#define\s*VKQUAKE_VER_PATCH\s*([0-9.]*)" "../../Quake/quakedef.h"
+$VersionMajorMatch=Select-String "^#define\s*VKQUAKE_VERSION_MAJOR\s*([0-9.]*)" "../../Quake/quakever.h"
+$VersionMajor=$VersionMajorMatch.Matches.groups[1].value
+$VersionMinorMatch=Select-String "^#define\s*VKQUAKE_VERSION_MINOR\s*([0-9.]*)" "../../Quake/quakever.h"
+$VersionMinor=$VersionMinorMatch.Matches.groups[1].value
+$PatchVersionMatch=Select-String "^#define\s*VKQUAKE_VER_PATCH\s*([0-9.]*)" "../../Quake/quakever.h"
 $PatchVersion=$PatchVersionMatch.Matches.groups[1].value
-$SuffixMatch=Select-String "^#define\s*VKQUAKE_VER_SUFFIX\s*`"([^`"]*)" "../../Quake/quakedef.h"
+$SuffixMatch=Select-String "^#define\s*VKQUAKE_VER_SUFFIX\s*`"([^`"]*)" "../../Quake/quakever.h"
 $Suffix=$SuffixMatch.Matches.groups[1].value
-$Version=$BaseVersion + '.' + $PatchVersion + $Suffix
+$Version=$VersionMajor + '.' + $VersionMinor + '.' + $PatchVersion + $Suffix
 $SrcDirX64="..\..\Windows\VisualStudio\Build-vkQuake\x64\Release"
 $SrcDirX86="..\..\Windows\VisualStudio\Build-vkQuake\x86\Release"
 

diff --git a/Quake/quakever.h b/Quake/quakever.h
@@ -36,10 +36,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define VKQUAKE_VERSION_MAJOR 1
 #define VKQUAKE_VERSION_MINOR 31
+#define VKQUAKE_VER_PATCH	  1
 
-// VKQUAKE_VERSION should = VKQUAKE_VERSION_MAJOR.VKQUAKE_VERSION_MINOR
-#define VKQUAKE_VERSION	  1.31
-#define VKQUAKE_VER_PATCH 1
+#define VKQUAKE_VERSION 1.31
 
 #define LINUX_VERSION VKQUAKE_VERSION