*Allow users to choose between SDL and OpenGL for monitor display

[kdenlive] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4e844f0642be454292d220fa95b005265239ae56..5dbd65b1224e131617b02ca6f43dd869ad81442c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,6 +16,8 @@ endif (Q_WS_X11)
 if (APPLE)
   find_package(OpenGL)
   set(QT_USE_QTOPENGL TRUE)
+else (APPLE)
+  macro_optional_find_package(OpenGL)
 endif (APPLE)
 
 include_directories (
@@ -58,7 +60,6 @@ kde4_add_ui_files(kdenlive_UI
   widgets/profiledialog_ui.ui
   widgets/projectsettings_ui.ui
   widgets/keyframewidget_ui.ui
-  widgets/constval_ui.ui
   widgets/listval_ui.ui
   widgets/wipeval_ui.ui
   widgets/boolval_ui.ui
@@ -98,6 +99,7 @@ kde4_add_ui_files(kdenlive_UI
   widgets/waveform_ui.ui
   widgets/rgbparade_ui.ui
   widgets/histogram_ui.ui
+  widgets/geometrywidget_ui.ui
 )
 
 set(kdenlive_SRCS
@@ -214,6 +216,10 @@ set(kdenlive_SRCS
   razorgroupcommand.cpp
   colorpickerwidget.cpp
   choosecolorwidget.cpp
+  monitorscene.cpp
+  geometrywidget.cpp
+  doubleparameterwidget.cpp
+  audiosignal.cpp
 )
 
 
@@ -221,15 +227,16 @@ add_subdirectory( ${CMAKE_SOURCE_DIR}/src/colorcorrection )
 
 add_definitions( ${KDE4_DEFINITIONS} )
 
-if(NO_JOGSHUTTLE)
+if(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR NO_JOGSHUTTLE)
   add_definitions(-DNO_JOGSHUTTLE)
-else(NO_JOGSHUTTLE)
+else(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR NO_JOGSHUTTLE)
   set(kdenlive_SRCS jogshuttle.cpp ${kdenlive_SRCS})
-endif(NO_JOGSHUTTLE)
+endif(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR NO_JOGSHUTTLE)
 
-if (APPLE)
+if (APPLE OR OPENGL_FOUND)
+  add_definitions(-DUSE_OPEN_GL)
   set(kdenlive_SRCS videoglwidget.cpp ${kdenlive_SRCS})
-endif (APPLE)
+endif (APPLE OR OPENGL_FOUND)
 
 kde4_add_kcfg_files(kdenlive_SRCS kdenlivesettings.kcfgc )
 QT4_ADD_DBUS_ADAPTOR(kdenlive_SRCS org.kdenlive.MainWindow.xml mainwindow.h MainWindow)
@@ -261,6 +268,11 @@ if (APPLE)
   target_link_libraries(kdenlive ${SDL_LIBRARY})
   target_link_libraries(kdenlive ${QT_QTOPENGL_LIBRARY})
   target_link_libraries(kdenlive ${OPENGL_LIBRARIES})
+else (APPLE)
+  if (OPENGL_FOUND)
+      target_link_libraries(kdenlive ${QT_QTOPENGL_LIBRARY})
+      target_link_libraries(kdenlive ${OPENGL_LIBRARIES})
+  endif (OPENGL_FOUND)
 endif (APPLE)
 
 install(TARGETS kdenlive DESTINATION ${BIN_INSTALL_DIR})