Browse Source

Rename zlib to the correct name

Panagiotis Christopoulos Charitos 4 years ago
parent
commit
656eed8b47

+ 2 - 1
CMakeLists.txt

@@ -211,7 +211,7 @@ endif()
 ################################################################################
 # Thirdparty                                                                   #
 ################################################################################
-set(ANKI_EXTERN_SUB_DIRS TinyXml2 Lua LibZ Bullet ImGui MeshOptimizer SprivCross)
+set(ANKI_EXTERN_SUB_DIRS TinyXml2 Lua ZLib Bullet ImGui MeshOptimizer SprivCross)
 
 # Bullet config
 option(BUILD_BULLET2_DEMOS OFF)
@@ -327,6 +327,7 @@ include_directories(
 	"${CMAKE_CURRENT_BINARY_DIR}"
 	"${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/Bullet/src"
 	"ThirdParty"
+	"ThirdParty/ZLib"
 	${CMAKE_CURRENT_SOURCE_DIR})
 
 if(LINUX OR MACOS OR WINDOWS)

+ 0 - 9
ThirdParty/LibZ/CMakeLists.txt

@@ -1,9 +0,0 @@
-FILE(GLOB_RECURSE ZLIB_SOURCES *.c)
-FILE(GLOB_RECURSE ZLIB_HEADERS *.h)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/)
-
-ADD_DEFINITIONS(-DUSE_FILE32API)
-
-ADD_LIBRARY(ankiz ${ZLIB_SOURCES} ${ZLIB_HEADERS})
-SET_TARGET_PROPERTIES(ankiz PROPERTIES LINKER_LANGUAGE C)

+ 9 - 0
ThirdParty/ZLib/CMakeLists.txt

@@ -0,0 +1,9 @@
+file(GLOB_RECURSE ZLIB_SOURCES *.c)
+file(GLOB_RECURSE ZLIB_HEADERS *.h)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/)
+
+add_definitions(-DUSE_FILE32API)
+
+add_library(ankiz ${ZLIB_SOURCES} ${ZLIB_HEADERS})
+set_target_properties(ankiz PROPERTIES LINKER_LANGUAGE C)

+ 0 - 0
ThirdParty/LibZ/adler32.c → ThirdParty/ZLib/adler32.c


+ 0 - 0
ThirdParty/LibZ/compress.c → ThirdParty/ZLib/compress.c


+ 0 - 0
ThirdParty/LibZ/contrib/minizip/crypt.h → ThirdParty/ZLib/contrib/minizip/crypt.h


+ 0 - 0
ThirdParty/LibZ/contrib/minizip/ioapi.c → ThirdParty/ZLib/contrib/minizip/ioapi.c


+ 0 - 0
ThirdParty/LibZ/contrib/minizip/ioapi.h → ThirdParty/ZLib/contrib/minizip/ioapi.h


+ 0 - 0
ThirdParty/LibZ/contrib/minizip/mztools.c → ThirdParty/ZLib/contrib/minizip/mztools.c


+ 0 - 0
ThirdParty/LibZ/contrib/minizip/mztools.h → ThirdParty/ZLib/contrib/minizip/mztools.h


+ 0 - 0
ThirdParty/LibZ/contrib/minizip/unzip.c → ThirdParty/ZLib/contrib/minizip/unzip.c


+ 0 - 0
ThirdParty/LibZ/contrib/minizip/unzip.h → ThirdParty/ZLib/contrib/minizip/unzip.h


+ 0 - 0
ThirdParty/LibZ/contrib/minizip/zip.c → ThirdParty/ZLib/contrib/minizip/zip.c


+ 0 - 0
ThirdParty/LibZ/contrib/minizip/zip.h → ThirdParty/ZLib/contrib/minizip/zip.h


+ 0 - 0
ThirdParty/LibZ/crc32.c → ThirdParty/ZLib/crc32.c


+ 0 - 0
ThirdParty/LibZ/crc32.h → ThirdParty/ZLib/crc32.h


+ 0 - 0
ThirdParty/LibZ/deflate.c → ThirdParty/ZLib/deflate.c


+ 0 - 0
ThirdParty/LibZ/deflate.h → ThirdParty/ZLib/deflate.h


+ 0 - 0
ThirdParty/LibZ/gzclose.c → ThirdParty/ZLib/gzclose.c


+ 0 - 0
ThirdParty/LibZ/gzguts.h → ThirdParty/ZLib/gzguts.h


+ 0 - 0
ThirdParty/LibZ/gzlib.c → ThirdParty/ZLib/gzlib.c


+ 0 - 0
ThirdParty/LibZ/gzread.c → ThirdParty/ZLib/gzread.c


+ 0 - 0
ThirdParty/LibZ/gzwrite.c → ThirdParty/ZLib/gzwrite.c


+ 0 - 0
ThirdParty/LibZ/infback.c → ThirdParty/ZLib/infback.c


+ 0 - 0
ThirdParty/LibZ/inffast.c → ThirdParty/ZLib/inffast.c


+ 0 - 0
ThirdParty/LibZ/inffast.h → ThirdParty/ZLib/inffast.h


+ 0 - 0
ThirdParty/LibZ/inffixed.h → ThirdParty/ZLib/inffixed.h


+ 0 - 0
ThirdParty/LibZ/inflate.c → ThirdParty/ZLib/inflate.c


+ 0 - 0
ThirdParty/LibZ/inflate.h → ThirdParty/ZLib/inflate.h


+ 0 - 0
ThirdParty/LibZ/inftrees.c → ThirdParty/ZLib/inftrees.c


+ 0 - 0
ThirdParty/LibZ/inftrees.h → ThirdParty/ZLib/inftrees.h


+ 0 - 0
ThirdParty/LibZ/trees.c → ThirdParty/ZLib/trees.c


+ 0 - 0
ThirdParty/LibZ/trees.h → ThirdParty/ZLib/trees.h


+ 0 - 0
ThirdParty/LibZ/uncompr.c → ThirdParty/ZLib/uncompr.c


+ 0 - 0
ThirdParty/LibZ/zconf.h → ThirdParty/ZLib/zconf.h


+ 0 - 0
ThirdParty/LibZ/zlib.h → ThirdParty/ZLib/zlib.h


+ 0 - 0
ThirdParty/LibZ/zutil.c → ThirdParty/ZLib/zutil.c


+ 0 - 0
ThirdParty/LibZ/zutil.h → ThirdParty/ZLib/zutil.h


+ 1 - 1
anki/resource/ResourceFilesystem.cpp

@@ -7,7 +7,7 @@
 #include <anki/util/Filesystem.h>
 #include <anki/core/ConfigSet.h>
 #include <anki/util/Tracer.h>
-#include <LibZ/contrib/minizip/unzip.h>
+#include <ZLib/contrib/minizip/unzip.h>
 
 namespace anki
 {