From a0efd18f965686245e7812fdb64582f9c7d2a0d5 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 12 May 2014 13:44:27 -0700
Subject: [PATCH] Use wx's vendored copy of zlib rather than having a second
 copy in a submodule

---
 .gitmodules                      |  4 ----
 build/DefaultConfiguration.props |  2 +-
 build/zlib/zlib.vcxproj          | 28 ++++++++++++++++++++++++++--
 vendor/zlib                      |  1 -
 4 files changed, 27 insertions(+), 8 deletions(-)
 delete mode 160000 vendor/zlib

diff --git a/.gitmodules b/.gitmodules
index 5172c91c7..d06d3932c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,6 @@
 	path = vendor/freetype2
 	url = git://git.sv.nongnu.org/freetype/freetype2.git
 	ignore = dirty
-[submodule "zlib"]
-	path = vendor/zlib
-	url = git://github.com/madler/zlib.git
-	ignore = dirty
 [submodule "wxWidgets"]
 	path = vendor/wxWidgets
 	url = git://github.com/wxWidgets/wxWidgets.git
diff --git a/build/DefaultConfiguration.props b/build/DefaultConfiguration.props
index c9d154fea..087a4d3cd 100644
--- a/build/DefaultConfiguration.props
+++ b/build/DefaultConfiguration.props
@@ -61,6 +61,6 @@
     <IcuSrcDir>..\..\vendor\icu\source</IcuSrcDir>
     <LibassSrcDir>..\..\vendor\libass</LibassSrcDir>
     <WxSrcDir>..\..\vendor\wxWidgets</WxSrcDir>
-    <ZlibSrcDir>..\..\vendor\zlib</ZlibSrcDir>
+    <ZlibSrcDir>..\..\vendor\wxWidgets\src\zlib</ZlibSrcDir>
   </PropertyGroup>
 </Project>
diff --git a/build/zlib/zlib.vcxproj b/build/zlib/zlib.vcxproj
index c8778896a..6cdbb898f 100644
--- a/build/zlib/zlib.vcxproj
+++ b/build/zlib/zlib.vcxproj
@@ -24,9 +24,33 @@
     <InstallHeaderTo Include="$(MSBuildThisFileDirectory)\zconf.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(ZlibSrcDir)\*.c" />
+    <ClCompile Include="$(ZlibSrcDir)\adler32.c" />
+    <ClCompile Include="$(ZlibSrcDir)\compress.c" />
+    <ClCompile Include="$(ZlibSrcDir)\crc32.c" />
+    <ClCompile Include="$(ZlibSrcDir)\deflate.c" />
+    <ClCompile Include="$(ZlibSrcDir)\gzclose.c" />
+    <ClCompile Include="$(ZlibSrcDir)\gzlib.c" />
+    <ClCompile Include="$(ZlibSrcDir)\gzread.c" />
+    <ClCompile Include="$(ZlibSrcDir)\gzwrite.c" />
+    <ClCompile Include="$(ZlibSrcDir)\infback.c" />
+    <ClCompile Include="$(ZlibSrcDir)\inffast.c" />
+    <ClCompile Include="$(ZlibSrcDir)\inflate.c" />
+    <ClCompile Include="$(ZlibSrcDir)\inftrees.c" />
+    <ClCompile Include="$(ZlibSrcDir)\trees.c" />
+    <ClCompile Include="$(ZlibSrcDir)\uncompr.c" />
+    <ClCompile Include="$(ZlibSrcDir)\zutil.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(ZlibSrcDir)\*.h" />
+    <ClInclude Include="$(ZlibSrcDir)\crc32.h" />
+    <ClInclude Include="$(ZlibSrcDir)\deflate.h" />
+    <ClInclude Include="$(ZlibSrcDir)\gzguts.h" />
+    <ClInclude Include="$(ZlibSrcDir)\inffast.h" />
+    <ClInclude Include="$(ZlibSrcDir)\inffixed.h" />
+    <ClInclude Include="$(ZlibSrcDir)\inflate.h" />
+    <ClInclude Include="$(ZlibSrcDir)\inftrees.h" />
+    <ClInclude Include="$(ZlibSrcDir)\trees.h" />
+    <ClInclude Include="$(ZlibSrcDir)\zconf.h" />
+    <ClInclude Include="$(ZlibSrcDir)\zlib.h" />
+    <ClInclude Include="$(ZlibSrcDir)\zutil.h" />
   </ItemGroup>
 </Project>
diff --git a/vendor/zlib b/vendor/zlib
deleted file mode 160000
index 508932916..000000000
--- a/vendor/zlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 50893291621658f355bc5b4d450a8d06a563053d