clean up version implementation

PhantomGamers · Aug 26, 2022 · ce71fbe · ce71fbe
1 parent 7ce705c
commit ce71fbe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/SUWSF/SUWSF.vcxproj b/SUWSF/SUWSF.vcxproj
@@ -24,7 +24,6 @@
     <ProjectGuid>{c38f8446-5545-4884-8bf2-696d0c6e2df1}</ProjectGuid>
     <RootNamespace>SUWSF</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <BuildVersion Condition="'$(BuildVersion)' == ''">DEV</BuildVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -132,8 +131,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BUILDVERSION>$(BuildVersion)</BUILDVERSION>
-      <AdditionalOptions>/DBUILD_VERSION="%(BUILDVERSION)" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/DNOMINMAX %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -151,10 +149,11 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;SUWSF_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <AdditionalOptions>/DNOMINMAX %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -179,8 +178,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BUILDVERSION>$(BuildVersion)</BUILDVERSION>
-      <AdditionalOptions>/DBUILD_VERSION="%(BUILDVERSION)" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/DNOMINMAX %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/SUWSF/dllmain.h b/SUWSF/dllmain.h
@@ -10,14 +10,14 @@
 #include <iomanip>
 #include <boost/algorithm/string/case_conv.hpp>
 
-#define STRINGIZER(arg)     #arg
-#define STR_VALUE(arg)      STRINGIZER(arg)
-#define BUILD_VERSION_STRING STR_VALUE(BUILD_VERSION)
+#ifndef BUILD_VERSION
+#define BUILD_VERSION "DEV"
+#endif
 
 const std::string APPNAME("SUWSF");
 const std::string ININAME(APPNAME + ".ini");
 
-const std::string VERSION = BUILD_VERSION_STRING;
+const std::string VERSION = BUILD_VERSION;
 
 TCHAR szFileName[MAX_PATH];
 MODULEINFO mInfo;