Merge branch 'master' of github.com:ccgus/jstalk

ccgus · Apr 4, 2012 · f0586c5 · f0586c5
2 parents 2de5d8d + 1a51751
commit f0586c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/bin/jstbuild.sh b/bin/jstbuild.sh
@@ -93,7 +93,7 @@ mv res/Info.plist.tmp res/Info.plist
 
 
 
-xcodebuild=/Developer/usr/bin/xcodebuild
+xcodebuild=/usr/bin/xcodebuild
 function buildTarget {
 
     echo Building "$1"

diff --git a/jscocoa/JSCocoa/JSCocoaController.m b/jscocoa/JSCocoa/JSCocoaController.m
@@ -249,7 +249,15 @@ - (id)initWithGlobalContext:(JSGlobalContextRef)_ctx
 	[self loadFrameworkWithName:@"AppKit"];
 	[self loadFrameworkWithName:@"CoreFoundation"];
 	[self loadFrameworkWithName:@"Foundation"];
-	[self loadFrameworkWithName:@"CoreGraphics" inPath:@"/System/Library/Frameworks/ApplicationServices.framework/Frameworks"];
+
+    // CoreGraphics.framework moved in 10.8
+    if ([[NSFileManager defaultManager] fileExistsAtPath:@"/System/Library/Frameworks/CoreGraphics.framework"]) {
+        [self loadFrameworkWithName:@"CoreGraphics"];
+    }
+    else {
+        [self loadFrameworkWithName:@"CoreGraphics" inPath:@"/System/Library/Frameworks/ApplicationServices.framework/Frameworks"];
+    }
+
 #endif	
 
 #if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE