diff --git a/CMakeLists.txt b/CMakeLists.txt index e81a645..80dc2b1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,11 +15,11 @@ PROJECT( playuver ) SET( PROJECT_NAME playuver ) # Project directories -SET( SRC_DIR source ) -SET( LIB_DIR ${SRC_DIR}/lib ) -SET( RSC_DIR resources ) -SET( UI_DIR ui ) -SET( EXTERNAL_SRC external_lib ) +SET( SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/source ) +SET( LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/source/lib ) +SET( RSC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources ) +SET( UI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ui ) +SET( EXTERNAL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/external ) SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") # Find includes in corresponding build directories @@ -41,7 +41,7 @@ ADD_OPTION(CMAKE_BUILD_TYPE "Build type" "Debug" ) ADD_OPTION(USE_WERROR "Warnings as errors" OFF ) ADD_OPTION(USE_QT4 "Build with QT4" OFF ) ADD_OPTION(USE_OPENCV "Add OpenCV support" OFF ) -ADD_OPTION(USE_PIXFC "Add PIXFC support" OFF ) +ADD_OPTION(USE_PIXFC "Add PIXFC support" ON ) ADD_OPTION(USE_FFMPEG "Add FFMPEG support" OFF ) ###################################################################################### diff --git a/cmake/LibPixfc.cmake b/cmake/LibPixfc.cmake index 44feb16..1d1cfca 100644 --- a/cmake/LibPixfc.cmake +++ b/cmake/LibPixfc.cmake @@ -1,8 +1,16 @@ ##################################################################################### -# Qt library cmake file +# Pixfc-sse library cmake file ###################################################################################### +# https://code.google.com/p/pixfc-sse/ +# svn checkout http://pixfc-sse.googlecode.com/svn/trunk/ pixfc-sse +# Add to folder external IF( USE_PIXFC ) - LIST(APPEND LINKER_LIBS pixfc-sse) + IF(EXISTS "${EXTERNAL_SRC}/pixfc-sse/build/src/libpixfc-sse.a") + INCLUDE_DIRECTORIES( ${EXTERNAL_SRC}/pixfc-sse/include ) + LIST(APPEND LINKER_LIBS ${EXTERNAL_SRC}/pixfc-sse/build/src/libpixfc-sse.a ) LIST(APPEND LINKER_LIBS rt) + ELSE() + SET( USE_PIXFC OFF ) + ENDIF() ENDIF() \ No newline at end of file diff --git a/config.h.in b/config.h.in index 485a930..b7bf1c6 100644 --- a/config.h.in +++ b/config.h.in @@ -43,5 +43,8 @@ #cmakedefine USE_FFMPEG +/* PIXFC-SSE lib */ +#cmakedefine USE_PIXFC + #endif // __CONFIG_PLAYUVER_H__