From 3c5edea2af2f6208ac183ccbf65a0ac427cc4bf7 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Wed, 16 Jan 2013 08:46:19 -0500 Subject: [PATCH] Slight clean up by adding a MOUNTAIN_LION define --- src/CMakeLists.osx.cmake | 7 +++++-- src/mac/TomahawkApp_Mac.mm | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.osx.cmake b/src/CMakeLists.osx.cmake index f7a502f47..97a40d265 100644 --- a/src/CMakeLists.osx.cmake +++ b/src/CMakeLists.osx.cmake @@ -28,14 +28,17 @@ if (APPLE) # 9.8.0 -> 10.5/Leopard # 10.4.0 -> 10.6/Snow Leopard # 11.x.x -> Lion + # 12.x.x -> Mountain Lion string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${CMAKE_HOST_SYSTEM_VERSION}) - if (DARWIN_VERSION GREATER 10) + if (DARWIN_VERSION GREATER 11) + SET(MOUNTAIN_LION 1) + elseif (DARWIN_VERSION GREATER 10) SET(LION 1) elseif (DARWIN_VERSION GREATER 9) SET(SNOW_LEOPARD 1) elseif (DARWIN_VERSION GREATER 8) SET(LEOPARD 1) - endif (DARWIN_VERSION GREATER 10) + endif (DARWIN_VERSION GREATER 11) # Use two different sparkle update tracks for debug and release # We have to change the URL in the Info.plist file :-/ diff --git a/src/mac/TomahawkApp_Mac.mm b/src/mac/TomahawkApp_Mac.mm index 3d856ba13..cc50a017f 100644 --- a/src/mac/TomahawkApp_Mac.mm +++ b/src/mac/TomahawkApp_Mac.mm @@ -240,7 +240,7 @@ void Tomahawk::checkForUpdates() { #endif } -#ifdef LION +#if defined(LION) || defined(MOUNTAIN_LION) #define SET_LION_FULLSCREEN NSWindowCollectionBehaviorFullScreenPrimary #define LION_FULLSCREEN_ENTER_NOTIFICATION_VALUE NSWindowWillEnterFullScreenNotification #define LION_FULLSCREEN_EXIT_NOTIFICATION_VALUE NSWindowDidExitFullScreenNotification