diff --git a/src/CMakeLists.osx.txt b/src/CMakeLists.osx.txt index 17d41ed68..9239931eb 100644 --- a/src/CMakeLists.osx.txt +++ b/src/CMakeLists.osx.txt @@ -27,12 +27,15 @@ if (APPLE) # Uses Darwin kernel version. # 9.8.0 -> 10.5/Leopard # 10.4.0 -> 10.6/Snow Leopard + # 11.x.x -> Lion string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${CMAKE_HOST_SYSTEM_VERSION}) - if (DARWIN_VERSION GREATER 9) + if (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 9) + endif (DARWIN_VERSION GREATER 10) # 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/config.h.in b/src/config.h.in index 5f9e1e438..6d1385f72 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -11,6 +11,7 @@ #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" #define CMAKE_SYSTEM "${CMAKE_SYSTEM}" +#cmakedefine LION #cmakedefine SNOW_LEOPARD #cmakedefine LEOPARD #cmakedefine HAVE_SPARKLE diff --git a/src/mac/tomahawkapp_mac.mm b/src/mac/tomahawkapp_mac.mm index 2178ae37b..91237e67a 100644 --- a/src/mac/tomahawkapp_mac.mm +++ b/src/mac/tomahawkapp_mac.mm @@ -23,8 +23,6 @@ #include "config.h" #include "tomahawkwindow.h" -#include "AvailabilityMacros.h" - #import #import #import @@ -236,7 +234,7 @@ void Tomahawk::checkForUpdates() { void Tomahawk::enableFullscreen() { -#if defined(MAC_OS_X_VERSION_10_7) +#ifdef LION qDebug() << "Enabling Lion Full-screeen"; // Can't include tomahawkapp.h in a .mm file, pulls in infosystem.h which uses // the objc keyword 'id'