Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tries to activate zlib compiling on mac

Browse Source
This commit is contained in:
xawotihs
2015-11-04 22:32:49 +01:00
parent a33517e5d0
commit ce71afd704
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -93,7 +93,7 @@ if(NOT backend_sdl AND UNIX AND NOT ANDROID)
endif() endif()
#third party build options #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_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_PNG "build png from source" (WIN32 OR APPLE OR PSP OR ANDROID OR EMSCRIPTEN))
WAGIC_OPTION(BUILD_UNZIP "build unzip from source" ON) WAGIC_OPTION(BUILD_UNZIP "build unzip from source" ON)
projects/mtg/CMakeLists.txt
+4 -4
View File
@@ -151,9 +151,9 @@ if(backend_qt_console)
${UNZIP_INCLUDE_DIR} ${HGE_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default) ${UNZIP_INCLUDE_DIR} ${HGE_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default)
add_executable(wagic ${MTG_generic_src} ${MTG_qt_console_src}) add_executable(wagic ${MTG_generic_src} ${MTG_qt_console_src})
target_link_libraries(wagic ${JGE_LIBRARY} ${Qt5Core_INCLUDE_DIRS} ${Qt5Multimedia_INCLUDE_DIRS} ${TINYXML_LIBRARIES} target_link_libraries(wagic ${JGE_LIBRARY} ${Qt5Core_INCLUDE_DIRS} ${Qt5Multimedia_INCLUDE_DIRS} ${TINYXML_LIBRARIES}
${HGE_LIBRARY}) ${HGE_LIBRARY} ${ZLIB_LIBRARIES})
else() 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() endif()
elseif(backend_qt_widget) elseif(backend_qt_widget)
if(UNIX AND NOT ANDROID) 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) ${UNZIP_INCLUDE_DIR} ${HGE_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default)
add_executable(wagic ${MTG_generic_src} ${MTG_qt_graphic_src}) 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} 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() 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() endif()
elseif(backend_sdl) elseif(backend_sdl)
if((UNIX OR EMSCRIPTEN) AND NOT ANDROID) if((UNIX OR EMSCRIPTEN) AND NOT ANDROID)