fix build. sorry 'bout that.
--- a/QTfrontend/CMakeLists.txt Sun Apr 30 00:11:50 2017 +0200
+++ b/QTfrontend/CMakeLists.txt Sun Apr 30 00:28:17 2017 +0200
@@ -21,9 +21,9 @@
endif()
find_package(SDL2 REQUIRED)
-find_package(SDL2_mixer REQUIRED) #audio in SDLInteraction
+find_package(SDL2_mixer 2 REQUIRED) #audio in SDLInteraction
include_directories(${SDL2_INCLUDE_DIR})
-include_directories(${SDL2MIXER_INCLUDE_DIR})
+include_directories(${SDL2_MIXER_INCLUDE_DIRS})
if(LIBAV_FOUND)
add_definitions(-DVIDEOREC -D__STDC_CONSTANT_MACROS)
@@ -203,7 +203,7 @@
list(APPEND HW_LINK_LIBS
${SDL2_LIBRARY}
- ${SDL2MIXER_LIBRARY}
+ ${SDL2_MIXER_LIBRARIES}
)
if(WIN32 AND NOT UNIX)
--- a/project_files/hwc/CMakeLists.txt Sun Apr 30 00:11:50 2017 +0200
+++ b/project_files/hwc/CMakeLists.txt Sun Apr 30 00:28:17 2017 +0200
@@ -2,10 +2,10 @@
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
find_package(SDL2 REQUIRED)
-find_package(SDL2_mixer REQUIRED)
-find_package(SDL2_net REQUIRED)
-find_package(SDL2_image REQUIRED)
-find_package(SDL2_ttf REQUIRED)
+find_package(SDL2_mixer 2 REQUIRED)
+find_package(SDL2_net 2 REQUIRED)
+find_package(SDL2_image 2 REQUIRED)
+find_package(SDL2_ttf 2 REQUIRED)
#compile our rtl implementation
include_directories(${GLEW_INCLUDE_DIR})
@@ -13,7 +13,7 @@
include_directories(${PHYSFS_INCLUDE_DIR})
include_directories(${PHYSLAYER_INCLUDE_DIR})
include_directories(${LUA_INCLUDE_DIR})
-include_directories(${SDL2_INCLUDE_DIR})
+include_directories(${SDL2_INCLUDE_DIRS})
add_subdirectory(rtl)
# convert list into pascal array
@@ -103,10 +103,10 @@
${LUA_LIBRARY}
${OPENGL_LIBRARY}
${SDL2_LIBRARY}
- ${SDL2_MIXER_LIBRARY}
- ${SDL2_NET_LIBRARY}
- ${SDL2_IMAGE_LIBRARY}
- ${SDL2_TTF_LIBRARY}
+ ${SDL2_MIXER_LIBRARIES}
+ ${SDL2_NET_LIBRARIES}
+ ${SDL2_IMAGE_LIBRARIES}
+ ${SDL2_TTF_LIBRARIES}
${GLEW_LIBRARY}
physfs
physlayer
--- a/tools/CMakeLists.txt Sun Apr 30 00:11:50 2017 +0200
+++ b/tools/CMakeLists.txt Sun Apr 30 00:28:17 2017 +0200
@@ -9,10 +9,10 @@
if(APPLE AND NOT SKIPBUNDLE)
find_package(Qt4 REQUIRED QUIET)
find_package(SDL2 REQUIRED)
- find_package(SDL2_image REQUIRED)
- find_package(SDL2_net REQUIRED)
- find_package(SDL2_ttf REQUIRED)
- find_package(SDL2_mixer REQUIRED)
+ find_package(SDL2_image 2 REQUIRED)
+ find_package(SDL2_net 2 REQUIRED)
+ find_package(SDL2_ttf 2 REQUIRED)
+ find_package(SDL2_mixer 2 REQUIRED)
find_package(OggVorbis REQUIRED)
find_package(PNG REQUIRED)
--- a/tools/CreateMacBundle.cmake.in Sun Apr 30 00:11:50 2017 +0200
+++ b/tools/CreateMacBundle.cmake.in Sun Apr 30 00:28:17 2017 +0200
@@ -25,10 +25,10 @@
execute_process(COMMAND cp ${PNG_LIBRARY} ${frameworks_dir})
execute_process(COMMAND cp -pPR ${sdl_library_only} ${frameworks_dir})
- execute_process(COMMAND cp -pPR ${SDL2IMAGE_LIBRARY} ${frameworks_dir})
- execute_process(COMMAND cp -pPR ${SDL2NET_LIBRARY} ${frameworks_dir})
- execute_process(COMMAND cp -pPR ${SDL2TTF_LIBRARY} ${frameworks_dir})
- execute_process(COMMAND cp -pPR ${SDL2MIXER_LIBRARY} ${frameworks_dir})
+ execute_process(COMMAND cp -pPR ${SDL2_IMAGE_LIBRARIES} ${frameworks_dir})
+ execute_process(COMMAND cp -pPR ${SDL2_NET_LIBRARIES} ${frameworks_dir})
+ execute_process(COMMAND cp -pPR ${SDL2_TTF_LIBRARIES} ${frameworks_dir})
+ execute_process(COMMAND cp -pPR ${SDL2_MIXER_LIBRARIES} ${frameworks_dir})
execute_process(COMMAND cp -pPR ${OGG_LIBRARY} ${frameworks_dir})
execute_process(COMMAND cp -pPR ${VORBIS_LIBRARY} ${frameworks_dir})