Updated zlib from 1.2.3 to 1.2.8

cmangos · Nov 4, 2016 · b011fe9 · b011fe9
1 parent 3c7ee03
commit b011fe9
Show file tree

Hide file tree

Showing 49 changed files with 5,389 additions and 5,563 deletions.
diff --git a/contrib/mmap/CMakeLists.txt b/contrib/mmap/CMakeLists.txt
@@ -31,7 +31,7 @@ include_directories(
     ../../src/framework
     ../../dep/recastnavigation/Detour/Include
     ../../dep/recastnavigation/Recast/Include
-    ../../dep/src/zlib
+    ../../dep/zlib
 )
 
 add_library(vmaplib

diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
@@ -21,6 +21,7 @@ add_compile_options(-w)
 
 add_subdirectory(recastnavigation)
 add_subdirectory(src)
+add_subdirectory(zlib)
 if (BUILD_VMAP_EXTRACTOR)
   add_subdirectory(libmpq)
 endif()
diff --git a/dep/include/zlib/zlib.h b/dep/include/zlib/zlib.h
diff --git a/dep/libmpq/win/VC120/libmpq.vcxproj b/dep/libmpq/win/VC120/libmpq.vcxproj
@@ -47,7 +47,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -67,7 +67,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>

diff --git a/dep/libmpq/win/VC140/libmpq.vcxproj b/dep/libmpq/win/VC140/libmpq.vcxproj
@@ -47,7 +47,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -67,7 +67,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>

diff --git a/dep/src/CMakeLists.txt b/dep/src/CMakeLists.txt
@@ -20,4 +20,3 @@ if (BUILD_CORE)
   add_subdirectory(gsoap)
 endif()
 add_subdirectory(g3dlite)
-add_subdirectory(zlib)
diff --git a/dep/src/g3dlite/CMakeLists.txt b/dep/src/g3dlite/CMakeLists.txt
@@ -123,7 +123,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
-  ${CMAKE_SOURCE_DIR}/dep/include/zlib
+  ${CMAKE_SOURCE_DIR}/dep/zlib
 )
 
 add_library(${LIBRARY_NAME} STATIC