diff -r 3331b30e4ef1 -r 88fde28bbda6 QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Sun Oct 21 01:28:33 2012 +0400 +++ b/QTfrontend/CMakeLists.txt Sat Nov 03 00:34:35 2012 +0400 @@ -28,7 +28,9 @@ # Configure for SDL find_package(SDL REQUIRED) find_package(SDL_mixer REQUIRED) -find_package(FFMPEG) +if(NOT NOVIDEOREC) + find_package(FFMPEG) +endif() include_directories(.) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/model) @@ -74,8 +76,8 @@ file(GLOB_RECURSE UIcpp ui/*.cpp) file(GLOB UtilCpp util/*.cpp) -if((NOT NOVIDEOREC) AND "${FFMPEG_FOUND}") - add_definitions(-DVIDEOREC) +if(${FFMPEG_FOUND}) + add_definitions(-DVIDEOREC -D__STDC_CONSTANT_MACROS) endif() set(hwfr_src @@ -130,7 +132,7 @@ hwform.h team.h util/DataManager.h - util/libav_iteraction.h + util/LibavInteraction.h ) set(hwfr_hdrs