Fix windows compilation with memoverride

zer0k-z · Jun 11, 2024 · 4cdb28e · 4cdb28e
1 parent 417dd23
commit 4cdb28e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/sql_mm.vcxproj b/sql_mm.vcxproj
@@ -144,15 +144,15 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__STDC_LIMIT_MACROS;X64BITS;WIN32;COMPILER_MSVC;COMPILER_MSVC64;_CRT_NO_VA_START_VALIDATION;_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_WINDOWS;sql_mm_EXPORTS;_USRDLL;META_IS_SOURCE2;SUBHOOK_STATIC;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>Default</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalIncludeDirectories>$(HL2SDKCS2)/public;$(HL2SDKCS2)/public/tier0;$(HL2SDKCS2)/game/shared;$(HL2SDKCS2)/game/server;$(HL2SDKCS2)/public/tier1;$(HL2SDKCS2)/public/mathlib;$(MMSOURCE112)/core;$(MMSOURCE112)/core/sourcehook;$(HL2SDKCS2)/public/entity2;$(HL2SDKCS2)/public/game/server;vendor/mysql/include;$(SolutionDir)/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <Optimization>Disabled</Optimization>
     </ClCompile>
@@ -169,6 +169,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="$(HL2SDKCS2)\public\tier0\memoverride.cpp" />
     <ClCompile Include="src\mysql\mysql_client.cpp" />
     <ClCompile Include="src\mysql\mysql_database.cpp" />
     <ClCompile Include="src\mysql\operations\mysql_connect.cpp" />

diff --git a/sql_mm.vcxproj.filters b/sql_mm.vcxproj.filters
@@ -104,6 +104,9 @@
     <ClCompile Include="src\utils\plat_win.cpp">
       <Filter>Source Files\utils</Filter>
     </ClCompile>
+    <ClCompile Include="$(HL2SDKCS2)\public\tier0\memoverride.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\sql_mm.h">

diff --git a/vendor/mysql/lib/mysqlclient.lib b/vendor/mysql/lib/mysqlclient.lib