colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-12 13:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'refs/remotes/280north/master'

Browse Source
This commit is contained in:
Aparajita Fishman
2011-05-11 08:13:33 -04:00
parent b3a427ba18 019acb76a3
commit 17dc96ad2f
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/NativeHost/Jakefile
+1 -1
View File
@@ -11,7 +11,7 @@ task ("build", function()
{
var args = "-alltargets -configuration Release";
if (FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk")))
if (xcodebuildHasTenPointFiveSDK())
args = "-sdk macosx10.5 " + args;
else
Tools/fontinfo/Jakefile
+1 -1
View File
@@ -10,7 +10,7 @@ task ("build", function()
{
var args = "-alltargets -configuration " + $CONFIGURATION;
if (FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk")))
if (xcodebuildHasTenPointFiveSDK())
args = "-sdk macosx10.5 " + args;
else
common.jake
+13
View File
@@ -456,6 +456,19 @@ global.copyManPage = function(/*String*/ name, /*int*/ section)
}
}
global.xcodebuildCanListSDKs = function ()
{
return OS.system("xcodebuild -showsdks > /dev/null 2>&1") == 0;
}
global.xcodebuildHasTenPointFiveSDK = function ()
{
if (xcodebuildCanListSDKs())
return OS.system("xcodebuild -showsdks | grep 'macosx10.5' > /dev/null 2>&1") == 0;
return FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk"));
}
// built in tasks