From 3e5194dd4e9efbd096de90ab60358b987a51d336 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Sun, 23 Mar 2014 12:16:11 +0000 Subject: [PATCH] fixed: ServiceManagement not available in 10.5 --- ext/toolchain/commands1.py | 10 ++++++++++ src/gui/gui.pro | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 97415ac3..ea4d67cc 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -505,6 +505,16 @@ class InternalCommands: # 10.4: universal (intel and power pc) qmake_cmd_string += ' CONFIG+="ppc i386"' + libs = ( + "-framework ApplicationServices " + "-framework Security " + "-framework cocoa") + + if major == 10 and minor >= 6: + libs += " -framework ServiceManagement" + + qmake_cmd_string += " \"MACX_LIBS=%s\" " % libs + sdkDir = self.getMacSdkDir() shortForm = "macosx" + self.macSdk version = str(major) + "." + str(minor) diff --git a/src/gui/gui.pro b/src/gui/gui.pro index eb5ec372..5eb9c9a8 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -80,10 +80,7 @@ macx { QSYNERGY_ICON.files = res/mac/Synergy.icns QSYNERGY_ICON.path = Contents/Resources QMAKE_BUNDLE_DATA += QSYNERGY_ICON - LIBS += -framework ApplicationServices \ - -framework ServiceManagement \ - -framework Security \ - -framework cocoa + LIBS += $$MACX_LIBS } debug { OBJECTS_DIR = tmp/debug