diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2013-11-11 23:42:27 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2013-11-11 23:42:27 +1100 |
| commit | b814cd16b821b2ae7b678206b8fa1bf98a4cd8fa (patch) | |
| tree | 1ba1547a2eca3f9c43cff9ad9ee7faf48b8f6c7b | |
| parent | f4091faacfcfb3a02f1c01108e78335873ff3eeb (diff) | |
| download | scintilla-mirror-b814cd16b821b2ae7b678206b8fa1bf98a4cd8fa.tar.gz | |
Update InfoBar to use combined images.
Change SDK setting to latest so will work with both Xcode 4.6 and 5.0.
| -rw-r--r-- | cocoa/InfoBar.mm | 2 | ||||
| -rw-r--r-- | cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cocoa/InfoBar.mm b/cocoa/InfoBar.mm index bb80bd33d..45093911d 100644 --- a/cocoa/InfoBar.mm +++ b/cocoa/InfoBar.mm @@ -87,7 +87,7 @@ { NSBundle* bundle = [NSBundle bundleForClass: [InfoBar class]]; - NSString* path = [bundle pathForResource: @"info_bar_bg" ofType: @"png" inDirectory: nil]; + NSString* path = [bundle pathForResource: @"info_bar_bg" ofType: @"tiff" inDirectory: nil]; mBackground = [[NSImage alloc] initWithContentsOfFile: path]; if (![mBackground isValid]) NSLog(@"Background image for info bar is invalid."); diff --git a/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj b/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj index ba5405c3f..ed140eda9 100644 --- a/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj +++ b/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj @@ -303,7 +303,7 @@ LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ""; PRODUCT_NAME = ScintillaTest; - SDKROOT = macosx10.7; + SDKROOT = macosx; USER_HEADER_SEARCH_PATHS = ""; }; name = Debug; @@ -328,7 +328,7 @@ LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ""; PRODUCT_NAME = ScintillaTest; - SDKROOT = macosx10.7; + SDKROOT = macosx; USER_HEADER_SEARCH_PATHS = ""; }; name = Release; @@ -344,7 +344,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ""; - SDKROOT = macosx10.7; + SDKROOT = macosx; }; name = Debug; }; @@ -357,7 +357,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = ""; - SDKROOT = macosx10.7; + SDKROOT = macosx; }; name = Release; }; |