mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Bump the base SDK and deployment target to 10.8

Browse source 
This required working around an incompatibility in base/mac/foundation_util.h.
This commit is contained in:
Adam Roben 2013-03-28 17:16:35 -04:00
parent e4e4cb6ec4
commit 1a1fecf423
7 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
brightray/brightray.gyp
View file

@ -48,6 +48,7 @@
'common/application_name_mac.mm',
'common/content_client.cc',
'common/content_client.h',
'common/mac/foundation_util.h',
'common/mac/main_application_bundle.h',
'common/mac/main_application_bundle.mm',
'common/main_delegate.cc',

4
brightray/brightray.gypi
View file

@ -4,8 +4,8 @@
'libchromiumcontent_library_dir': '<(libchromiumcontent_dir)/Release',
'libchromiumcontent_include_dir': '<(libchromiumcontent_dir)/include',
'libchromiumcontent_resources_dir': '<(libchromiumcontent_library_dir)',
'mac_deployment_target%': '10.7',
'mac_sdkroot%': 'macosx10.7',
'mac_deployment_target%': '10.8',
'mac_sdkroot%': 'macosx',
},
'target_defaults': {
'defines': [

2
brightray/browser/browser_main_parts_mac.mm
View file

@ -14,7 +14,7 @@ void BrowserMainParts::PreMainMessageLoopStart() {
NSString *mainNibName = [infoDictionary objectForKey:@"NSMainNibFile"];
auto mainNib = [[NSNib alloc] initWithNibNamed:mainNibName bundle:base::mac::FrameworkBundle()];
[mainNib instantiateNibWithOwner:application topLevelObjects:nil];
[mainNib instantiateWithOwner:application topLevelObjects:nil];
[mainNib release];
}

3
brightray/common/application_name_mac.mm
View file

@ -1,9 +1,8 @@
#import "common/application_name.h"
#import "common/mac/foundation_util.h"
#import "common/mac/main_application_bundle.h"
#import "base/mac/foundation_util.h"
namespace brightray {
std::string GetApplicationName() {

15
brightray/common/mac/foundation_util.h Normal file
View file

@ -0,0 +1,15 @@
#ifndef BRIGHTRAY_COMMON_MAC_FOUNDATION_UTIL_H_
#define BRIGHTRAY_COMMON_MAC_FOUNDATION_UTIL_H_
// This header exists to work around incompatibilities between
// base/mac/foundation_util.h and the 10.8 SDK.
#import <Foundation/Foundation.h>
// base/mac/foundation_util.h contains an incompatible declaration of NSSearchPathDirectory,
// so here we #define it to be something else.
#define NSSearchPathDirectory NSSearchPathDirectory___PRE_10_8
#import "base/mac/foundation_util.h"
#undef NSSearchPathDirectory
#endif

3
brightray/common/mac/main_application_bundle.mm
View file

@ -5,8 +5,9 @@
#import "common/mac/main_application_bundle.h"
#import "common/mac/foundation_util.h"
#import "base/files/file_path.h"
#import "base/mac/foundation_util.h"
#import "base/path_service.h"
namespace brightray {

2
brightray/common/main_delegate_mac.mm
View file

@ -6,10 +6,10 @@
#import "main_delegate.h"
#include "common/application_name.h"
#include "common/mac/foundation_util.h"
#include "common/mac/main_application_bundle.h"
#include "base/mac/bundle_locations.h"
#include "base/mac/foundation_util.h"
#include "base/path_service.h"
#include "content/public/common/content_paths.h"
#include "ui/base/resource/resource_bundle.h"