Merge pull request #23 from rdumusc/master

Fix build and deployement of DesktopStreamer on OSX 10.7

.gitexternals

@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-# CMake/common https://github.com/Eyescale/CMake.git 5734155
+# CMake/common https://github.com/Eyescale/CMake.git 188cf22

.gitsubprojects

@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-git_subproject(Servus https://github.com/HBPVIS/Servus d910737)
+git_subproject(Servus https://github.com/HBPVIS/Servus 0e1db45)

apps/DesktopStreamer/CMakeLists.txt

@@ -32,8 +32,12 @@ if(APPLE)
   set(DESKTOPSTREAMER_ICON desktopstreamer.icns)
 
   list(APPEND DESKTOPSTREAMER_SOURCES AppNapSuspender.mm)
-  list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES
-    "-framework Foundation -framework CoreGraphics")
+  list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES "-framework Foundation")
+  if(OSX_VERSION VERSION_LESS 10.9)
+    list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES "-framework ApplicationServices")
+  else()
+    list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES "-framework CoreGraphics")
+  endif()
 elseif(WIN32)
   list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES Ws2_32)
 endif()

apps/DesktopStreamer/DesktopSelectionView.h

@@ -39,6 +39,8 @@
 #ifndef DESKTOP_SELECTION_VIEW_H
 #define DESKTOP_SELECTION_VIEW_H
 
+#include <deflect/config.h>
+
 #include <QtWidgets>
 
 class DesktopSelectionRectangle;

apps/DesktopStreamer/MainWindow.cpp

@@ -55,7 +55,11 @@ typedef __int32 int32_t;
 #endif
 
 #ifdef __APPLE__
-#  include <CoreGraphics/CoreGraphics.h>
+#  if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
+#    include <CoreGraphics/CoreGraphics.h>
+#  else
+#    include <ApplicationServices/ApplicationServices.h>
+#  endif
 #endif
 
 #define SHARE_DESKTOP_UPDATE_DELAY      1
@@ -198,6 +202,8 @@ void MainWindow::_startStreaming()
 
 #ifdef __APPLE__
     _napSuspender.suspend();
+#endif
+#ifdef DEFLECT_USE_SERVUS
     _browseTimer.stop();
 #endif
     _updateTimer.start( SHARE_DESKTOP_UPDATE_DELAY );