From 9e9302f8cd98e2202f667b39a8b21b457230e1cf Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 2 Feb 2014 22:31:48 +0000 Subject: [PATCH] Changes in the build behaviour --- CMakeLists.txt | 7 ++++++- {source => lib/ffmpeg}/LibAvContextHandle.cpp | 0 {source => lib/ffmpeg}/LibAvContextHandle.h | 0 3 files changed, 6 insertions(+), 1 deletion(-) rename {source => lib/ffmpeg}/LibAvContextHandle.cpp (100%) rename {source => lib/ffmpeg}/LibAvContextHandle.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8072b32..31aac33 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ SET( PROJECT_NAME playuver ) # Project directories SET( SRC_DIR source ) SET( INC_DIR source ) +SET( LIB_DIR lib ) SET( RSC_DIR resources ) SET( UI_DIR ui ) SET( EXTERNAL_SRC external_lib ) @@ -198,7 +199,11 @@ IF( USE_FFMPEG ) ELSE() SET( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS ) INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS}) - SET( LINKER_LIBS ${LINKER_LIBS} ${FFMPEG_LIBRARIES} ) + INCLUDE_DIRECTORIES( ${LIB_DIR}/ffmpeg ) + ADD_LIBRARY( FFmpeg ${LIB_DIR}/ffmpeg/LibAvContextHandle.cpp ) + TARGET_LINK_LIBRARIES( FFmpeg ${FFMPEG_LIBRARIES} ) + + SET( LINKER_LIBS ${LINKER_LIBS} FFmpeg ) ENDIF() ENDIF() diff --git a/source/LibAvContextHandle.cpp b/lib/ffmpeg/LibAvContextHandle.cpp similarity index 100% rename from source/LibAvContextHandle.cpp rename to lib/ffmpeg/LibAvContextHandle.cpp diff --git a/source/LibAvContextHandle.h b/lib/ffmpeg/LibAvContextHandle.h similarity index 100% rename from source/LibAvContextHandle.h rename to lib/ffmpeg/LibAvContextHandle.h