equal
deleted
inserted
replaced
18 ${QTVERSION} VERSION_GREATER "4.7.0" AND |
18 ${QTVERSION} VERSION_GREATER "4.7.0" AND |
19 ${QTVERSION} VERSION_LESS "4.7.4") |
19 ${QTVERSION} VERSION_LESS "4.7.4") |
20 message(FATAL_ERROR "This version of Qt is known *not* to work, please update or use a lower version") |
20 message(FATAL_ERROR "This version of Qt is known *not* to work, please update or use a lower version") |
21 endif() |
21 endif() |
22 |
22 |
23 find_package(SDL1or2) #video in SDLInteraction |
23 find_package(SDL2 REQUIRED) |
24 find_package(SDL_mixer REQUIRED) #audio in SDLInteraction |
24 find_package(SDL2_mixer REQUIRED) #audio in SDLInteraction |
|
25 include_directories(${SDL2_INCLUDE_DIR}) |
|
26 include_directories(${SDL2MIXER_INCLUDE_DIR}) |
25 |
27 |
26 if(LIBAV_FOUND) |
28 if(LIBAV_FOUND) |
27 add_definitions(-DVIDEOREC -D__STDC_CONSTANT_MACROS) |
29 add_definitions(-DVIDEOREC -D__STDC_CONSTANT_MACROS) |
28 include_directories(${LIBAV_INCLUDE_DIR}) |
30 include_directories(${LIBAV_INCLUDE_DIR}) |
29 list(APPEND HW_LINK_LIBS ${LIBAV_LIBRARIES}) |
31 list(APPEND HW_LINK_LIBS ${LIBAV_LIBRARIES}) |
58 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/dialog) |
60 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/dialog) |
59 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/page) |
61 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/page) |
60 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/widget) |
62 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/widget) |
61 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util) |
63 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util) |
62 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util/platform) |
64 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util/platform) |
63 include_directories(${SDL_INCLUDE_DIR}) |
|
64 include_directories(${SDLMIXER_INCLUDE_DIR}) |
|
65 include_directories(BEFORE ${PHYSFS_INCLUDE_DIR}) |
65 include_directories(BEFORE ${PHYSFS_INCLUDE_DIR}) |
66 include_directories(BEFORE ${PHYSLAYER_INCLUDE_DIR}) |
66 include_directories(BEFORE ${PHYSLAYER_INCLUDE_DIR}) |
67 include_directories(${LUA_INCLUDE_DIR}) #brought by physlayer hwpacksmounter.h |
67 include_directories(${LUA_INCLUDE_DIR}) #brought by physlayer hwpacksmounter.h |
68 |
68 |
69 if(UNIX) |
69 if(UNIX) |
202 ) |
202 ) |
203 |
203 |
204 list(APPEND HW_LINK_LIBS |
204 list(APPEND HW_LINK_LIBS |
205 physfs physlayer |
205 physfs physlayer |
206 ${QT_LIBRARIES} |
206 ${QT_LIBRARIES} |
207 ${SDL_LIBRARY} |
207 ) |
208 ${SDLMIXER_LIBRARY} |
208 |
|
209 list(APPEND HW_LINK_LIBS |
|
210 ${SDL2_LIBRARY} |
|
211 ${SDL2MIXER_LIBRARY} |
209 ) |
212 ) |
210 |
213 |
211 if(WIN32 AND NOT UNIX) |
214 if(WIN32 AND NOT UNIX) |
212 if(NOT SDL_LIBRARY) |
215 if(NOT SDL2_LIBRARY) |
213 list(APPEND HW_LINK_LIBS SDL) |
216 list(APPEND HW_LINK_LIBS SDL2) |
214 endif() |
217 endif() |
215 |
218 |
216 list(APPEND HW_LINK_LIBS |
219 list(APPEND HW_LINK_LIBS |
217 ole32 |
220 ole32 |
218 oleaut32 |
221 oleaut32 |