Commit b3fdf930 authored by Gerhard Stein's avatar Gerhard Stein

SDL Mixer 1.2 support added

parent 63c9aec0
...@@ -12,7 +12,7 @@ include(cotire) ...@@ -12,7 +12,7 @@ include(cotire)
option(USE_PYTHON3 "Use Python3 scripts" yes) option(USE_PYTHON3 "Use Python3 scripts" yes)
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 14)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Set a default build type if none was specified # Set a default build type if none was specified
......
Subproject commit 74655119c2661fc2c89f2e555a5603fa4c301018 Subproject commit 2ca94f95cab7236b9eccb421f930579f92dce066
...@@ -161,7 +161,7 @@ else(USE_SDL2) ...@@ -161,7 +161,7 @@ else(USE_SDL2)
if(SDL_FOUND) if(SDL_FOUND)
message(STATUS "Using shared SDL Version 1.2") message(STATUS "Using shared SDL Version 1.2")
include_directories(${SDL_INCLUDE_DIR}) include_directories(${SDL_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIRS}) #INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIRS})
else(SDL_FOUND) else(SDL_FOUND)
# TODO: Use the prebuilt one on Windows # TODO: Use the prebuilt one on Windows
message("Using static SDL from Externals") message("Using static SDL from Externals")
...@@ -179,8 +179,15 @@ ENDIF (OPENGL) ...@@ -179,8 +179,15 @@ ENDIF (OPENGL)
IF(WIN32) IF(WIN32)
find_package(SDL_Mixer) find_package(SDL_Mixer)
else(WIN32) else(WIN32)
INCLUDE(FindPkgConfig) INCLUDE(FindPkgConfig)
if(USE_SDL2)
PKG_CHECK_MODULES(SDL_MIXER SDL2_mixer>=2.0.0) PKG_CHECK_MODULES(SDL_MIXER SDL2_mixer>=2.0.0)
else()
PKG_CHECK_MODULES(SDL_MIXER SDL_mixer>=1.0.0)
endif()
endif(WIN32) endif(WIN32)
if(${SDL_MIXER_FOUND}) if(${SDL_MIXER_FOUND})
...@@ -227,15 +234,15 @@ target_link_libraries( CGeniusExe ${ZLIB_LIBRARIES} ) ...@@ -227,15 +234,15 @@ target_link_libraries( CGeniusExe ${ZLIB_LIBRARIES} )
if(USE_SDL2) if(USE_SDL2)
target_link_libraries(CGeniusExe ${SDL2_LIBRARY}) # target_link_libraries(CGeniusExe ${SDL2_LIBRARY})
target_link_libraries(CGeniusExe ${SDL2IMAGE_LIBRARY}) # target_link_libraries(CGeniusExe ${SDL2IMAGE_LIBRARY})
message(STATUS "SDL2_LIBRARY = ${SDL2_LIBRARY}") message(STATUS "SDL2_LIBRARY = ${SDL2_LIBRARY}")
message(STATUS "SDL2IMAGE_LIBRARY = ${SDL2IMAGE_LIBRARY}") message(STATUS "SDL2IMAGE_LIBRARY = ${SDL2IMAGE_LIBRARY}")
else(USE_SDL2) else(USE_SDL2)
# SDL stuff to link # SDL stuff to link
target_link_libraries(CGeniusExe ${SDL_NET_LIBRARIES}) # target_link_libraries(CGeniusExe ${SDL_NET_LIBRARIES})
target_link_libraries(CGeniusExe ${SDL_LIBRARY}) # target_link_libraries(CGeniusExe ${SDL_LIBRARY})
target_link_libraries(CGeniusExe ${SDL_IMAGE_LIBRARY}) # target_link_libraries(CGeniusExe ${SDL_IMAGE_LIBRARY})
endif(USE_SDL2) endif(USE_SDL2)
......
...@@ -20,7 +20,7 @@ target_link_libraries(sdl_extensions_audio ...@@ -20,7 +20,7 @@ target_link_libraries(sdl_extensions_audio
if(${SDL_MIXER_FOUND}) if(${SDL_MIXER_FOUND})
LINK_DIRECTORIES(${SDL_MIXER_LIBRARY_DIRS}) LINK_DIRECTORIES(${SDL_MIXER_LIBRARY_DIRS})
target_link_libraries(sdl_extensions_audio target_link_libraries(sdl_extensions_audio
${SDL_MIXER_LIBRARIES}) ${SDL_MIXER_LIBRARY})
endif() endif()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment