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

Pass compilation on mac.

Browse source
This commit is contained in:
Haojian Wu 2016-08-05 22:57:33 +02:00
parent cd169f933e
commit 2e5eeef70e
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/atom_browser_main_parts_mac.mm
View file

@ -18,7 +18,7 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {
// Set our own application delegate. // Set our own application delegate.
AtomApplicationDelegate* delegate = [[AtomApplicationDelegate alloc] init]; AtomApplicationDelegate* delegate = [[AtomApplicationDelegate alloc] init];
[NSApp setDelegate:(id<NSFileManagerDelegate>)delegate]; [NSApp setDelegate:delegate];
brightray::BrowserMainParts::PreMainMessageLoopStart(); brightray::BrowserMainParts::PreMainMessageLoopStart();

6
toolchain.gypi
View file

@ -5,6 +5,10 @@
# Set this to true when building with Clang. # Set this to true when building with Clang.
'clang%': 1, 'clang%': 1,
'clang_warning_flags': [
'-Wno-undefined-var-template', # https://crbug.com/604888
],
'variables': { 'variables': {
# The minimum macOS SDK version to use. # The minimum macOS SDK version to use.
'mac_sdk_min%': '10.10', 'mac_sdk_min%': '10.10',
@ -104,6 +108,7 @@
'cflags_cc': [ 'cflags_cc': [
'-std=c++11', '-std=c++11',
], ],
'cflags': [ '<@(clang_warning_flags)' ],
'xcode_settings': { 'xcode_settings': {
'CC': '<(make_clang_dir)/bin/clang', 'CC': '<(make_clang_dir)/bin/clang',
'LDPLUSPLUS': '<(make_clang_dir)/bin/clang++', 'LDPLUSPLUS': '<(make_clang_dir)/bin/clang++',
@ -111,6 +116,7 @@
'-fcolor-diagnostics', '-fcolor-diagnostics',
], ],
'WARNING_CFLAGS': ['<@(clang_warning_flags)'],
'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99 'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99
'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++ 'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11