From ce71afd70484995059df65e34750a9f5be532f2b Mon Sep 17 00:00:00 2001 From: xawotihs Date: Wed, 4 Nov 2015 22:32:49 +0100 Subject: [PATCH] Tries to activate zlib compiling on mac --- CMakeLists.txt | 2 +- projects/mtg/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a69ac68ed..f14810310 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ if(NOT backend_sdl AND UNIX AND NOT ANDROID) endif() #third party build options -WAGIC_OPTION(BUILD_ZLIB "build zlib from source" WIN32 OR EMSCRIPTEN) +WAGIC_OPTION(BUILD_ZLIB "build zlib from source" WIN32 OR APPLE OR EMSCRIPTEN) WAGIC_OPTION(BUILD_JPEG "build jpeg from source" (WIN32 OR APPLE OR PSP OR ANDROID OR EMSCRIPTEN)) WAGIC_OPTION(BUILD_PNG "build png from source" (WIN32 OR APPLE OR PSP OR ANDROID OR EMSCRIPTEN)) WAGIC_OPTION(BUILD_UNZIP "build unzip from source" ON) diff --git a/projects/mtg/CMakeLists.txt b/projects/mtg/CMakeLists.txt index 694bdf02f..64af0f993 100644 --- a/projects/mtg/CMakeLists.txt +++ b/projects/mtg/CMakeLists.txt @@ -151,9 +151,9 @@ if(backend_qt_console) ${UNZIP_INCLUDE_DIR} ${HGE_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default) add_executable(wagic ${MTG_generic_src} ${MTG_qt_console_src}) target_link_libraries(wagic ${JGE_LIBRARY} ${Qt5Core_INCLUDE_DIRS} ${Qt5Multimedia_INCLUDE_DIRS} ${TINYXML_LIBRARIES} - ${HGE_LIBRARY}) + ${HGE_LIBRARY} ${ZLIB_LIBRARIES}) else() - message(FATAL_ERROR "qt-console bilds are only supported on unix platforms") + message(FATAL_ERROR "qt-console builds are only supported on unix platforms") endif() elseif(backend_qt_widget) if(UNIX AND NOT ANDROID) @@ -161,9 +161,9 @@ elseif(backend_qt_widget) ${UNZIP_INCLUDE_DIR} ${HGE_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default) add_executable(wagic ${MTG_generic_src} ${MTG_qt_graphic_src}) target_link_libraries(wagic ${JGE_LIBRARY} ${Qt5Core_INCLUDE_DIRS} ${Qt5Multimedia_INCLUDE_DIRS} ${OPENGL_LIBRARIES} ${TINYXML_LIBRARIES} - ${HGE_LIBRARY})# ${X11_LIBRARIES}) + ${HGE_LIBRARY})# ${X11_LIBRARIES} ${ZLIB_LIBRARIES}) else() - message(FATAL_ERROR "qt-widget bilds are only supported on unix platforms") + message(FATAL_ERROR "qt-widget builds are only supported on unix platforms") endif() elseif(backend_sdl) if((UNIX OR EMSCRIPTEN) AND NOT ANDROID)