fix: protobuf errors when switching release type

mehah · Jan 8, 2025 · 9c16403 · 9c16403
1 parent f29cbfd
commit 9c16403
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/vc17/otclient.vcxproj b/vc17/otclient.vcxproj
@@ -157,11 +157,11 @@
     <VcpkgInstalledDir>vcpkg_installed</VcpkgInstalledDir>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <VcpkgTriplet>x86-windows</VcpkgTriplet>
+    <VcpkgTriplet>x86-windows-static</VcpkgTriplet>
     <VcpkgInstalledDir>vcpkg_installed</VcpkgInstalledDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Vcpkg">
-    <VcpkgTriplet>x64-windows</VcpkgTriplet>
+    <VcpkgTriplet>x64-windows-static</VcpkgTriplet>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -190,6 +190,7 @@
       <LanguageStandard>stdcpp20</LanguageStandard>
       <DisableSpecificWarnings>4244;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <CombineFilesOnlyFromTheSameFolder>true</CombineFilesOnlyFromTheSameFolder>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -624,7 +625,6 @@
     <ClInclude Include="..\src\framework\util\point.h" />
     <ClInclude Include="..\src\framework\util\rect.h" />
     <ClInclude Include="..\src\framework\util\size.h" />
-    <ClInclude Include="..\src\protobuf\appearances.pb.h" />
     <ClInclude Include="..\src\gitinfo.h" />
   </ItemGroup>
   <ItemGroup>
@@ -664,4 +664,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/vc17/settings.props b/vc17/settings.props
@@ -25,7 +25,7 @@
         glew32.lib;
         kernel32.lib;
         ole32.lib;
-        physfs-static.lib;
+        physfs.lib;
         shell32.lib;
         user32.lib;
         winmm.lib;
@@ -51,14 +51,15 @@
         gdi32.lib;
         glew32d.lib;
         kernel32.lib;
+		ole32.lib;
         lua51.lib;
         ogg.lib;
         lzma.lib;
         libssl.lib;
         libcrypto.lib;
         libprotobufd.lib;
         opengl32.lib;
-        physfs.lib;
+        physfs-static.lib;
         shell32.lib;
         user32.lib;
         vorbis.lib;