mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:tomahawk-player/tomahawk

Browse Source
This commit is contained in:
Jason Herskowitz
2011-09-21 21:36:16 -04:00
parent 272c31f132 ef9a790df0
commit b513a34fb8
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.osx.txt
View File

@@ -27,12 +27,15 @@ if (APPLE)
# Uses Darwin kernel version. # Uses Darwin kernel version.
# 9.8.0 -> 10.5/Leopard # 9.8.0 -> 10.5/Leopard
# 10.4.0 -> 10.6/Snow Leopard # 10.4.0 -> 10.6/Snow Leopard
# 11.x.x -> Lion
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${CMAKE_HOST_SYSTEM_VERSION}) 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) SET(SNOW_LEOPARD 1)
elseif (DARWIN_VERSION GREATER 8) elseif (DARWIN_VERSION GREATER 8)
SET(LEOPARD 1) SET(LEOPARD 1)
endif (DARWIN_VERSION GREATER 9) endif (DARWIN_VERSION GREATER 10)
# Use two different sparkle update tracks for debug and release # Use two different sparkle update tracks for debug and release
# We have to change the URL in the Info.plist file :-/ # We have to change the URL in the Info.plist file :-/

1
src/config.h.in
View File

@@ -11,6 +11,7 @@
#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
#define CMAKE_SYSTEM "${CMAKE_SYSTEM}" #define CMAKE_SYSTEM "${CMAKE_SYSTEM}"
#cmakedefine LION
#cmakedefine SNOW_LEOPARD #cmakedefine SNOW_LEOPARD
#cmakedefine LEOPARD #cmakedefine LEOPARD
#cmakedefine HAVE_SPARKLE #cmakedefine HAVE_SPARKLE

4
src/mac/tomahawkapp_mac.mm
View File

@@ -23,8 +23,6 @@
#include "config.h" #include "config.h"
#include "tomahawkwindow.h" #include "tomahawkwindow.h"
#include "AvailabilityMacros.h"
#import <AppKit/NSApplication.h> #import <AppKit/NSApplication.h>
#import <Foundation/NSAutoreleasePool.h> #import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSBundle.h> #import <Foundation/NSBundle.h>
@@ -236,7 +234,7 @@ void Tomahawk::checkForUpdates() {
void Tomahawk::enableFullscreen() void Tomahawk::enableFullscreen()
{ {
#if defined(MAC_OS_X_VERSION_10_7) #ifdef LION
qDebug() << "Enabling Lion Full-screeen"; qDebug() << "Enabling Lion Full-screeen";
// Can't include tomahawkapp.h in a .mm file, pulls in infosystem.h which uses // Can't include tomahawkapp.h in a .mm file, pulls in infosystem.h which uses
// the objc keyword 'id' // the objc keyword 'id'