SporeModManager: compile zlib manually

Rosalie241 · Oct 18, 2023 · 9500581 · 9500581
1 parent 5f61375
commit 9500581
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 15 deletions.
diff --git a/SporeModManager/SporeModManager.vcxproj b/SporeModManager/SporeModManager.vcxproj
@@ -72,16 +72,16 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\3rdParty\zlib\;$(MSBuildProjectDirectory)\..\3rdParty\zlib\build\;$(MSBuildProjectDirectory)\..\3rdParty\zlib\contrib\minizip;$(MSBuildProjectDirectory)\..\3rdParty\tinyxml2\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(MSBuildProjectDirectory)\..\3rdParty\zlib\build\Release;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\3rdParty\zlib\;$(MSBuildProjectDirectory)\..\3rdParty\zlib\contrib\minizip;$(MSBuildProjectDirectory)\..\3rdParty\tinyxml2\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
     <OutDir>$(MSBuildProjectDirectory)\Bin\$(Configuration)\</OutDir>
     <IntDir>$(MSBuildProjectDirectory)\Obj\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(MSBuildProjectDirectory)\Bin\$(Configuration)\</OutDir>
-    <IncludePath>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\3rdParty\zlib\;$(MSBuildProjectDirectory)\..\3rdParty\zlib\build\;$(MSBuildProjectDirectory)\..\3rdParty\zlib\contrib\minizip;$(MSBuildProjectDirectory)\..\3rdParty\tinyxml2\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(MSBuildProjectDirectory)\..\3rdParty\zlib\build\Release;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\3rdParty\zlib\;$(MSBuildProjectDirectory)\..\3rdParty\zlib\contrib\minizip;$(MSBuildProjectDirectory)\..\3rdParty\tinyxml2\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
     <IntDir>$(MSBuildProjectDirectory)\Obj\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -102,11 +102,11 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>zlibstatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>if NOT EXIST "$(MSBuildProjectDirectory)\..\3rdParty\zlib\build\Release\zlibstatic.lib" (
-    "$(MSBuildProjectDirectory)\..\3rdParty\BuildZlib.bat"
+      <Command>if NOT EXIST "$(MSBuildProjectDirectory)\..\3rdParty\zlib\zconf.h" (
+    COPY  "$(MSBuildProjectDirectory)\..\3rdParty\zlib\zconf.h.in"  "$(MSBuildProjectDirectory)\..\3rdParty\zlib\zconf.h"
 )</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -127,11 +127,11 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>zlibstatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>if NOT EXIST "$(MSBuildProjectDirectory)\..\3rdParty\zlib\build\Release\zlibstatic.lib" (
-    CALL "$(MSBuildProjectDirectory)\..\3rdParty\BuildZlib.bat"
+      <Command>if NOT EXIST "$(MSBuildProjectDirectory)\..\3rdParty\zlib\zconf.h" (
+    COPY  "$(MSBuildProjectDirectory)\..\3rdParty\zlib\zconf.h.in"  "$(MSBuildProjectDirectory)\..\3rdParty\zlib\zconf.h"
 )</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -165,8 +165,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\3rdParty\tinyxml2\tinyxml2.cpp" />
+    <ClCompile Include="..\3rdParty\zlib\adler32.c" />
     <ClCompile Include="..\3rdParty\zlib\contrib\minizip\unzip.c" />
     <ClCompile Include="..\3rdParty\zlib\contrib\minizip\ioapi.c" />
+    <ClCompile Include="..\3rdParty\zlib\crc32.c" />
+    <ClCompile Include="..\3rdParty\zlib\inffast.c" />
+    <ClCompile Include="..\3rdParty\zlib\inflate.c" />
+    <ClCompile Include="..\3rdParty\zlib\inftrees.c" />
+    <ClCompile Include="..\3rdParty\zlib\zutil.c" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="SporeModManager.cpp" />
     <ClCompile Include="SporeModManagerHelpers\FileVersion.cpp" />

diff --git a/SporeModManager/SporeModManager.vcxproj.filters b/SporeModManager/SporeModManager.vcxproj.filters
@@ -16,14 +16,20 @@
     <Filter Include="Source Files\SporeModManagerHelpers">
       <UniqueIdentifier>{61ad4daa-3baa-44fa-a0fb-98a6919882c7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\zlib">
+      <UniqueIdentifier>{a6d9c111-91ba-4900-acf6-60049f263cea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\minizip">
+      <UniqueIdentifier>{c8b1b946-c638-47a9-a404-6674639fb364}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\tinyxml2">
+      <UniqueIdentifier>{b88d4cd0-62a5-4033-a17e-38574d8fa513}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\3rdParty\tinyxml2\tinyxml2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="SporeModManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -48,11 +54,32 @@
     <ClCompile Include="SporeModManagerHelpers\FileVersion.cpp">
       <Filter>Source Files\SporeModManagerHelpers</Filter>
     </ClCompile>
+    <ClCompile Include="..\3rdParty\zlib\adler32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3rdParty\zlib\crc32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3rdParty\zlib\inffast.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3rdParty\zlib\inflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3rdParty\zlib\inftrees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3rdParty\zlib\zutil.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
     <ClCompile Include="..\3rdParty\zlib\contrib\minizip\unzip.c">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\minizip</Filter>
     </ClCompile>
     <ClCompile Include="..\3rdParty\zlib\contrib\minizip\ioapi.c">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3rdParty\tinyxml2\tinyxml2.cpp">
+      <Filter>Source Files\tinyxml2</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>