remove miniz and zlib from libzetaglest

source/glest_game/CMakeLists.txt

@@ -170,6 +170,27 @@ IF(BUILD_ZETAGLEST)
 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY})
 	endif()
 
+	message(STATUS "Searching for zlib")
+	include(FindZLIB)
+	IF (FORCE_EMBEDDED_LIBS OR NOT ZLIB_FOUND)
+		# miniz is a library included with the ZG distribution. Not as
+			# developed as zlib, but smaller, and uses the same function names
+			# so basically a replacement for miniz. We may one day replace
+			# miniz with the zlib sources
+		SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES}
+			${PROJECT_SOURCE_DIR}/external/miniz/miniz.c
+			${PROJECT_SOURCE_DIR}/external/miniz/miniz_tdef.c
+			${PROJECT_SOURCE_DIR}/external/miniz/miniz_tinfl.c)
+		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/external/miniz)
+	ELSE()
+		if (ZLIB_FOUND)
+			message(STATUS "Using external zlib")
+			SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${ZLIB_LIBRARIES})
+			INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
+			add_definitions("-DHAVE_ZLIB")
+		ENDIF()
+	ENDIF()
+
 	SET(DIRS_WITH_SRC
 		ai
 		facilities

source/glest_game/menu/compression_utils.cpp

@@ -27,7 +27,7 @@
 #ifdef HAVE_ZLIB
 	#include <zlib.h>
 #else
-	#include "miniz/miniz.h"
+	#include "miniz.h"
 #endif
 
 using namespace Shared::Util;

source/shared_lib/CMakeLists.txt

@@ -214,28 +214,7 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST)
 		endif()
 	endif()
 
-	message(STATUS "Searching for zlib")
-	include(FindZLIB)
-	IF (FORCE_EMBEDDED_LIBS OR NOT ZLIB_FOUND)
-		SET(DIRS_WITH_SRC
-			${DIRS_WITH_SRC}
-			# miniz is a library included with the ZG distribution. Not as
-			# developed as zlib, but smaller, and uses the same function names
-			# so basically a replacement for miniz. We may one day replace
-			# miniz with the zlib sources
-			miniz)
-	ELSE()
-		if (ZLIB_FOUND)
-			message(STATUS "Using external zlib")
-			SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${ZLIB_LIBRARIES})
-			INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
-			add_definitions("-DHAVE_ZLIB")
-		ENDIF()
-	ENDIF()
-
 	SET(DIRS_WITH_SRC
-		${DIRS_WITH_SRC}
-		compression
 		feathery_ftp
 		glew
 		graphics