Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit f0586c592c110cdd6f0e146d8de918795a822fe2 2 parents 2de5d8d + 1a51751
August "Gus" Mueller authored
Showing with 10 additions and 2 deletions.
  1. +1 −1  bin/jstbuild.sh
  2. +9 −1 jscocoa/JSCocoa/JSCocoaController.m
2  bin/jstbuild.sh
View
@@ -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"
10 jscocoa/JSCocoa/JSCocoaController.m
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.