diff -r 7f6786625667 -r 966d180184b4 QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Mon Nov 11 00:15:20 2013 +0400 +++ b/QTfrontend/CMakeLists.txt Fri Dec 06 00:02:10 2013 +0100 @@ -19,17 +19,17 @@ message(FATAL_ERROR "This version of QT is known *not* to work, please update or use a lower version") endif() -if(${USESDL12}) +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(${USESDL12}) +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(${USESDL12}) +endif(${NOSDL2}) if(${FFMPEG_FOUND}) add_definitions(-DVIDEOREC -D__STDC_CONSTANT_MACROS) @@ -207,7 +207,7 @@ ${QT_LIBRARIES} ) -if(USESDL12) +if(NOSDL2) list(APPEND HW_LINK_LIBS ${SDL_LIBRARY} ${SDLMIXER_LIBRARY}