diff -r f2b18754742f -r 7a7611adf715 QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Tue Dec 17 00:02:52 2013 +0400 +++ b/QTfrontend/CMakeLists.txt Tue Nov 10 17:45:14 2015 +0100 @@ -19,17 +19,10 @@ message(FATAL_ERROR "This version of QT is known *not* to work, please update or use a lower version") endif() -if(${NOSDL2}) - find_package(SDL REQUIRED) #video in SDLInteraction - find_package(SDL_mixer REQUIRED) #audio in SDLInteraction - include_directories(${SDL_INCLUDE_DIR}) - include_directories(${SDLMIXER_INCLUDE_DIR}) -else(${NOSDL2}) - find_package(SDL2 REQUIRED) - find_package(SDL2_mixer REQUIRED) #audio in SDLInteraction - include_directories(${SDL2_INCLUDE_DIR}) - include_directories(${SDL2MIXER_INCLUDE_DIR}) -endif(${NOSDL2}) +find_package(SDL2 REQUIRED) +find_package(SDL2_mixer REQUIRED) #audio in SDLInteraction +include_directories(${SDL2_INCLUDE_DIR}) +include_directories(${SDL2MIXER_INCLUDE_DIR}) if(${FFMPEG_FOUND}) add_definitions(-DVIDEOREC -D__STDC_CONSTANT_MACROS) @@ -207,17 +200,10 @@ ${QT_LIBRARIES} ) -if(NOSDL2) - list(APPEND HW_LINK_LIBS - ${SDL_LIBRARY} - ${SDLMIXER_LIBRARY} - ) -else() - list(APPEND HW_LINK_LIBS - ${SDL2_LIBRARY} - ${SDL2MIXER_LIBRARY} - ) -endif() +list(APPEND HW_LINK_LIBS + ${SDL2_LIBRARY} + ${SDL2MIXER_LIBRARY} + ) if(WIN32 AND NOT UNIX) if(NOT SDL_LIBRARY)