3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-07-17 08:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '64bit' of https://github.com/petroules/synergy into petroules-64bit

Browse source
This commit is contained in:
Xinyu Hou 2014-10-22 11:40:00 +01:00
commit 4aa43d6995
6 changed files with 59 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ext/toolchain/commands1.py
View file

@ -554,7 +554,24 @@ class InternalCommands:
return (major, minor, rev)
def getMacSdkDir(self):
return "/Developer/SDKs/MacOSX" + self.macSdk + ".sdk"
sdkName = "macosx" + self.macSdk
# Ideally we'll use xcrun (which is influenced by $DEVELOPER_DIR), then try a couple
# fallbacks to known paths if xcrun is not available
status, sdkPath = commands.getstatusoutput("xcrun --show-sdk-path --sdk " + sdkName)
if status == 0 and sdkPath:
return sdkPath
developerDir = os.getenv("DEVELOPER_DIR")
if not developerDir:
developerDir = "/Applications/Xcode.app/Contents/Developer"
sdkDirName = sdkName.replace("macosx", "MacOSX")
sdkPath = developerDir + "/Platforms/MacOSX.platform/Developer/SDKs/" + sdkDirName + ".sdk"
if os.path.exists(sdkPath):
return sdkPath
return "/Developer/SDKs/" + sdkDirName + ".sdk"
# http://tinyurl.com/cs2rxxb
def fixCmakeEclipseBug(self):