From: Simon A. E. <sim...@gm...> - 2012-02-15 21:17:04
|
Git commit 05f4fad9a19434399f43ff76e06d1e1a5f74c0f6 by Simon A. Eugster. Committed on 15/02/2012 at 18:44. Pushed by eugster into branch 'audioAlign'. Merge branch 'next' into audioAlign Conflicts: src/lib/CMakeLists.txt M +1 -0 .gitignore M +1 -0 src/CMakeLists.txt M +4 -2 src/lib/CMakeLists.txt http://commits.kde.org/kdenlive/05f4fad9a19434399f43ff76e06d1e1a5f74c0f6 diff --cc .gitignore index e7f8a12,bdc5af0..f444b54 --- a/.gitignore +++ b/.gitignore @@@ -1,2 -1,2 +1,3 @@@ + *~ build +CMakeLists.txt.user diff --cc src/CMakeLists.txt index fa0e56c,5ccf034..f69796e --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@@ -83,11 -77,10 +83,12 @@@ add_subdirectory(beziercurve add_subdirectory(colorcorrection) add_subdirectory(colorscopes) add_subdirectory(commands) +add_subdirectory(lib) +add_subdirectory(projecttree) +add_subdirectory(utils) add_subdirectory(databackup) add_subdirectory(kiss_fft) + add_subdirectory(lib) add_subdirectory(mimetypes) add_subdirectory(onmonitoritems) add_subdirectory(simplekeyframes) diff --cc src/lib/CMakeLists.txt index e3a89b0,05dd09f..fe191f3 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@@ -1,10 -1,5 +1,12 @@@ + +add_subdirectory(audio) + +# Hack. kdenlive_SRCS is defined in the sub-scope and added to this scope; +# now we again need to add it to the parent scope. + set(kdenlive_SRCS - ${kdenlive_SRCS} - PARENT_SCOPE + ${kdenlive_SRCS} + lib/qtimerWithTime.cpp + PARENT_SCOPE -) +) ++ |