equal
deleted
inserted
replaced
13 find_package(Qt4 REQUIRED) |
13 find_package(Qt4 REQUIRED) |
14 include(${QT_USE_FILE}) |
14 include(${QT_USE_FILE}) |
15 |
15 |
16 find_package(SDL REQUIRED) #video in SDLInteraction |
16 find_package(SDL REQUIRED) #video in SDLInteraction |
17 find_package(SDL_mixer REQUIRED) #audio in SDLInteraction |
17 find_package(SDL_mixer REQUIRED) #audio in SDLInteraction |
18 find_package(SDL_net REQUIRED) #network frontlib |
18 |
19 if(NOT NOVIDEOREC) |
19 if(${FFMPEG_FOUND}) |
20 find_package(FFMPEG) |
20 add_definitions(-DVIDEOREC -D__STDC_CONSTANT_MACROS) |
21 if(${FFMPEG_FOUND}) |
21 include_directories(${FFMPEG_INCLUDE_DIR}) |
22 add_definitions(-DVIDEOREC -D__STDC_CONSTANT_MACROS) |
22 list(APPEND HW_LINK_LIBS ${FFMPEG_LIBRARIES}) |
23 endif() |
|
24 endif() |
23 endif() |
25 |
24 |
26 # server messages localization |
25 # server messages localization |
27 file(GLOB ServerSources ${CMAKE_SOURCE_DIR}/gameServer/*.hs) |
26 file(GLOB ServerSources ${CMAKE_SOURCE_DIR}/gameServer/*.hs) |
28 foreach(hsfile ${ServerSources}) |
27 foreach(hsfile ${ServerSources}) |
54 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/widget) |
53 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/widget) |
55 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util) |
54 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util) |
56 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util/platform) |
55 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util/platform) |
57 include_directories(${SDL_INCLUDE_DIR}) |
56 include_directories(${SDL_INCLUDE_DIR}) |
58 include_directories(${SDLMIXER_INCLUDE_DIR}) |
57 include_directories(${SDLMIXER_INCLUDE_DIR}) |
59 include_directories(${FFMPEG_INCLUDE_DIR}) |
|
60 include_directories(${PHYSFS_INCLUDE_DIR}) |
58 include_directories(${PHYSFS_INCLUDE_DIR}) |
61 include_directories(${PHYSLAYER_INCLUDE_DIR}) |
59 include_directories(${PHYSLAYER_INCLUDE_DIR}) |
62 |
60 |
63 |
61 |
64 if(UNIX) |
62 if(UNIX) |
202 ${PHYSFS_LIBRARY} |
200 ${PHYSFS_LIBRARY} |
203 ${PHYSLAYER_LIBRARY} |
201 ${PHYSLAYER_LIBRARY} |
204 ${QT_LIBRARIES} |
202 ${QT_LIBRARIES} |
205 ${SDL_LIBRARY} |
203 ${SDL_LIBRARY} |
206 ${SDLMIXER_LIBRARY} |
204 ${SDLMIXER_LIBRARY} |
207 ${FFMPEG_LIBRARIES} |
|
208 ) |
205 ) |
209 |
206 |
210 if(WIN32 AND NOT UNIX) |
207 if(WIN32 AND NOT UNIX) |
211 if(NOT SDL_LIBRARY) |
208 if(NOT SDL_LIBRARY) |
212 list(APPEND HW_LINK_LIBS SDL) |
209 list(APPEND HW_LINK_LIBS SDL) |