X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=19e34508d20fb88ba1a31c70ecc4079d04a08d02;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=b74ca370779ca311af1f41a9622dfd43193bf370;hpb=aec01436823fc842d7bf7158e79bac84c1521552;p=kdenlive

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b74ca370..19e34508 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -258,10 +258,6 @@ kde4_add_ui_files(kdenlive_UIS
   ui/importkeyframesdialog_ui.ui
 )
 
-if(OPENGL_FOUND)
-  list(APPEND kdenlive_SRCS widgets/videoglwidget.cpp)
-endif(OPENGL_FOUND)
-
 if(BUILD_JogShuttle)
   list(APPEND kdenlive_SRCS
     jogaction.cpp
@@ -295,6 +291,8 @@ include_directories(
   ${KDE4_INCLUDES} # Adds Qt include directories too.
   ${LIBMLT_INCLUDE_DIR}
   ${LIBMLTPLUS_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib/external 
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib 
 )
 
 
@@ -320,24 +318,15 @@ target_link_libraries(kdenlive
   ${LIBMLTPLUS_LIBRARY}
   ${CMAKE_DL_LIBS}
   ${CMAKE_THREAD_LIBS_INIT}
+  ${OPENGL_LIBRARIES}
+  kiss_fft
 )
 
-if(BUILD_JogShuttle)
-  target_link_libraries(kdenlive
-    ${CMAKE_SOURCE_DIR}/lib/libmedia_ctrl.a
-  )
-endif(BUILD_JogShuttle)
-
 if(Q_WS_X11)
   include_directories(${X11_Xlib_INCLUDE_PATH})
   target_link_libraries(kdenlive ${X11_LIBRARIES})
 endif(Q_WS_X11)
 
-if(OPENGL_FOUND AND QT_QTOPENGL_FOUND)
-  add_definitions(-DUSE_OPENGL)
-  target_link_libraries(kdenlive ${OPENGL_LIBRARIES})
-endif(OPENGL_FOUND AND QT_QTOPENGL_FOUND)
-
 if(SDL_FOUND)
   target_link_libraries(kdenlive ${SDL_LIBRARY})
 endif(SDL_FOUND)
@@ -346,7 +335,7 @@ if(NepomukCore_FOUND)
     add_definitions(-DUSE_NEPOMUKCORE)
     include_directories(${NEPOMUK_CORE_INCLUDE_DIR})
     target_link_libraries(kdenlive ${NEPOMUK_CORE_LIBRARY})
-else(NepomukWidgets_FOUND)
+else()
   if(Nepomuk_FOUND)
     add_definitions(-DUSE_NEPOMUK)
     include_directories(${NEPOMUK_INCLUDES})
@@ -368,6 +357,9 @@ endif(BUILD_V4L)
 
 if(BUILD_JogShuttle)
   add_definitions(-DUSE_JOGSHUTTLE)
+  target_link_libraries(kdenlive
+    media_ctrl
+  )
 endif(BUILD_JogShuttle)
 
 install(TARGETS kdenlive DESTINATION ${BIN_INSTALL_DIR})