Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-08-16 14:54:18 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-08-16 14:55:55 (GMT) |
| commit | 00a26ca1c2d3f753599d5608b18726996beeb4b1 (patch) | |
| tree | 261f166c5c58e4eb0d0faa442e88317d71ced6ba /BuildTools/SCons | |
| parent | e3f01043d60e745620a63fb785dd0d4674ec9370 (diff) | |
| download | swift-00a26ca1c2d3f753599d5608b18726996beeb4b1.zip swift-00a26ca1c2d3f753599d5608b18726996beeb4b1.tar.bz2 | |
Some build system fixes.
Diffstat (limited to 'BuildTools/SCons')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 8cdd81a..8bb3bdd 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -169,11 +169,9 @@ if target in ("iphone-device", "iphone-simulator"): sdkVer = iOSVersion sdk = "/Developer/Platforms/" + sdkPart + ".platform/Developer/SDKs/" + sdkPart + sdkVer + ".sdk" - env["FRAMEWORKS"] = ["CoreFoundation", "Foundation", "UIKit", "CoreGraphics"] + env.Append(FRAMEWORKS = ["CoreFoundation", "Foundation", "UIKit", "CoreGraphics"]) env.Append(LINKFLAGS = ["-L\"" + sdk + "/usr/lib\"", "-F\"" + sdk + "/System/Library/Frameworks\"", "-F\"" + sdk + "/System/Library/PrivateFrameworks\""]) - env["CPPPATH"] = ["/Users/kismith/devel/swift/iPhone/Swiftly/swift/", "/Developer/Platforms/" + sdkPart + ".platform/Developer/usr/lib/gcc/" + targetIncludesArch + "-apple-darwin9/4.0.1/include/", sdk + "/usr/include", sdk + "/usr/include/c++/4.0.0/" + targetIncludesArch + "-apple-darwin9", sdk + "/usr/include/c++/4.0.0", "/Developer/Platforms/" + sdkPart + ".platform/Developer/usr/include/"] - -# end cross compiling stuff + env.Append(CPPFLAGS = ["-isysroot", sdk]) conf_env = env.Clone() @@ -408,6 +406,12 @@ elif env.get("bonjour", False) : env["BONJOUR_FLAGS"]["LIBS"] = ["dnssd"] bonjour_conf.Finish() +# Cocoa +if env["PLATFORM"] == "darwin" : + cocoa_conf = Configure(conf_env) + if cocoa_conf.CheckCHeader("Cocoa/Cocoa.h") : + env["HAVE_COCOA"] = True + cocoa_conf.Finish() ################################################################################ # DocBook setup |