From 2666bf7cf3b30a2e8c635e3c1891b367ed2ecbbf Mon Sep 17 00:00:00 2001 From: jerry Date: Tue, 6 May 2014 16:12:27 +0000 Subject: [PATCH] copy synmacph only on mavericks. fixed warning on 10.6 --- ext/toolchain/commands1.py | 9 +++++---- src/gui/src/AXDatabaseCleaner.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 33d275a0..325cda15 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -780,10 +780,11 @@ class InternalCommands: shutil.copy(targetDir + "/synergys", bundleBinDir) shutil.copy(targetDir + "/syntool", bundleBinDir) - launchServicesDir = dir + "/Synergy.app/Contents/Library/LaunchServices/" - if not os.path.exists(launchServicesDir): - os.makedirs(launchServicesDir) - shutil.copy(targetDir + "/synmacph", launchServicesDir) + if self.macSdk == "10.9": + launchServicesDir = dir + "/Synergy.app/Contents/Library/LaunchServices/" + if not os.path.exists(launchServicesDir): + os.makedirs(launchServicesDir) + shutil.copy(targetDir + "/synmacph", launchServicesDir) if self.enableMakeGui: # use qt to copy libs to bundle so no dependencies are needed. do not create a diff --git a/src/gui/src/AXDatabaseCleaner.h b/src/gui/src/AXDatabaseCleaner.h index b759f29c..380c09f8 100644 --- a/src/gui/src/AXDatabaseCleaner.h +++ b/src/gui/src/AXDatabaseCleaner.h @@ -17,7 +17,7 @@ #pragma once -#include +#include // HACK: ideally this file should not be included in project, // if it is below marvericks, but it seems that .pro can't