Fix ICU inilialization bug.
This commit is contained in:
parent
cd4c5d976b
commit
ad19381217
2 changed files with 1 additions and 6 deletions
3
atom.gyp
3
atom.gyp
|
@ -313,6 +313,7 @@
|
|||
},
|
||||
'mac_bundle_resources': [
|
||||
'<@(bundle_sources)',
|
||||
'<(libchromiumcontent_resources_dir)/icudtl.dat',
|
||||
],
|
||||
'copies': [
|
||||
{
|
||||
|
@ -377,7 +378,6 @@
|
|||
'files': [
|
||||
'<(libchromiumcontent_library_dir)/chromiumcontent.dll',
|
||||
'<(libchromiumcontent_library_dir)/ffmpegsumo.dll',
|
||||
'<(libchromiumcontent_library_dir)/icudt.dll',
|
||||
'<(libchromiumcontent_library_dir)/libEGL.dll',
|
||||
'<(libchromiumcontent_library_dir)/libGLESv2.dll',
|
||||
'<(libchromiumcontent_resources_dir)/icudtl.dat',
|
||||
|
@ -663,7 +663,6 @@
|
|||
'mac_bundle_resources': [
|
||||
'atom/common/resources/mac/MainMenu.xib',
|
||||
'<(libchromiumcontent_resources_dir)/content_shell.pak',
|
||||
'<(libchromiumcontent_resources_dir)/icudtl.dat',
|
||||
],
|
||||
'xcode_settings': {
|
||||
'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist',
|
||||
|
|
|
@ -52,10 +52,6 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
|
|||
}
|
||||
|
||||
void AtomMainDelegate::PreSandboxStartup() {
|
||||
#if defined(OS_MACOSX)
|
||||
OverrideChildProcessPath();
|
||||
OverrideFrameworkBundlePath();
|
||||
#endif
|
||||
InitializeResourceBundle();
|
||||
|
||||
CommandLine* command_line = CommandLine::ForCurrentProcess();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue