Use system zlib

This commit is contained in:
dhewg 2012-07-04 17:46:41 +02:00 committed by Daniel Gibson
parent d250bf9262
commit 04bea1b10f

View file

@ -76,6 +76,9 @@ if (DHEWM3LIBS)
endif() endif()
# libs # libs
find_package(ZLIB REQUIRED)
include_directories(${ZLIB_INCLUDE_DIRS})
find_package(JPEG REQUIRED) find_package(JPEG REQUIRED)
include_directories(${JPEG_INCLUDE_DIR}) include_directories(${JPEG_INCLUDE_DIR})
@ -734,6 +737,7 @@ if (CORE)
${VORBIS_LIBRARIES} ${VORBIS_LIBRARIES}
${CURL_LIBRARY} ${CURL_LIBRARY}
${JPEG_LIBRARY} ${JPEG_LIBRARY}
${ZLIB_LIBRARY}
${SDL_LIBRARY} ${SDL_LIBRARY}
${sys_libs} ${sys_libs}
) )
@ -765,6 +769,7 @@ if (DEDICATED)
${VORBIS_LIBRARIES} ${VORBIS_LIBRARIES}
${CURL_LIBRARY} ${CURL_LIBRARY}
${JPEG_LIBRARY} ${JPEG_LIBRARY}
${ZLIB_LIBRARY}
${SDL_LIBRARY} ${SDL_LIBRARY}
${sys_libs} ${sys_libs}
) )