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

Got SDL2 version compiling on Mac.

Browse Source
This commit is contained in:
xawotihs
2015-10-06 23:25:40 +02:00
parent 22d14b2a4f
commit 075d950249
8 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeModules/FindOrBuild.cmake
View File

@@ -91,21 +91,24 @@ endmacro()
macro(FindOrBuildZLIB)
if(BUILD_ZLIB)
add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/zlib)
set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/zlib ${CMAKE_BINARY_DIR}/thirdparty/zlib)
set(ZLIB_LIBRARY zlib)
set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/thirdparty/zlib ${CMAKE_BINARY_DIR}/thirdparty/zlib)
set(ZLIB_LIBRARIES zlib)
else()
if(WIN32)
set(ZLIB_ROOT ${CMAKE_SOURCE_DIR}/thirdparty/binary/win)
find_package(ZLIB)
else()
find_package(ZLIB)
if(backend_qt_console OR backend_qt_widget)
else()
find_package(ZLIB)
endif()
endif()
endif()
endmacro()
macro(FindOrBuildGIF)
if(BUILD_GIF)
message(WARNING "ZLIB sources are currently not included within the wagic tree")
message(WARNING "GIF sources are currently not included within the wagic tree")
else()
find_package(GIF)
endif()
@@ -202,6 +205,7 @@ macro(FindOrBuildOpenGL)
set(OPENGL_LIBRARIES "-ldl -lGLESv1_CM -lGLESv2 -llog -landroid")
else()
find_package(OpenGL)
find_package(GLUT)
endif()
endif()
endmacro()