From a37fc0896bbe9afed3de4127b215c1879951f145 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Fri, 14 Feb 2014 17:01:47 +0000 Subject: [PATCH] fixed: distftp needs to know mac sdk used --- tools/build/generators.py | 3 +++ tools/build/toolchain.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/tools/build/generators.py b/tools/build/generators.py index 8383370a..3b473ff9 100644 --- a/tools/build/generators.py +++ b/tools/build/generators.py @@ -54,6 +54,9 @@ class XcodeGenerator(Generator): super(XcodeGenerator, self).__init__('Xcode') def getBinDir(self, target=''): + if target == "": + return super(XcodeGenerator, self).getBinDir(target) + xcodeTarget = target[0].upper() + target[1:] return super(XcodeGenerator, self).getBinDir(target) + '/' + xcodeTarget diff --git a/tools/build/toolchain.py b/tools/build/toolchain.py index c741da1e..174f0a08 100644 --- a/tools/build/toolchain.py +++ b/tools/build/toolchain.py @@ -816,6 +816,10 @@ class InternalCommands: return major + '.' + minor + '.' + rev def distftp(self, type, ftp): + config = self.getConfig() + if config.has_option("cmake", "mac_sdk"): + self.macSdk = config.get("cmake", "mac_sdk") + if not type: raise Exception('Type not specified.')