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

Set libraries' path according to libchromiumcontent_component variable

Browse source
This commit is contained in:
Cheng Zhao 2015-04-02 22:14:18 +08:00
parent faac37a85c
commit 4977741f35
3 changed files with 119 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
brightray/brightray.gyp
View file

@ -8,22 +8,22 @@
'type': 'static_library',
'include_dirs': [
'.',
'<(libchromiumcontent_include_dir)',
'<(libchromiumcontent_include_dir)/skia/config',
'<(libchromiumcontent_include_dir)/third_party/skia/include/core',
'<(libchromiumcontent_include_dir)/third_party/WebKit',
'<(libchromiumcontent_library_dir)/gen',
'<(libchromiumcontent_src_dir)',
'<(libchromiumcontent_src_dir)/skia/config',
'<(libchromiumcontent_src_dir)/third_party/skia/include/core',
'<(libchromiumcontent_src_dir)/third_party/WebKit',
'<(libchromiumcontent_dir)/gen',
],
'direct_dependent_settings': {
'include_dirs': [
'.',
'..',
'<(libchromiumcontent_include_dir)',
'<(libchromiumcontent_include_dir)/skia/config',
'<(libchromiumcontent_include_dir)/third_party/skia/include/core',
'<(libchromiumcontent_include_dir)/third_party/icu/source/common',
'<(libchromiumcontent_include_dir)/third_party/WebKit',
'<(libchromiumcontent_library_dir)/gen',
'<(libchromiumcontent_src_dir)',
'<(libchromiumcontent_src_dir)/skia/config',
'<(libchromiumcontent_src_dir)/third_party/skia/include/core',
'<(libchromiumcontent_src_dir)/third_party/icu/source/common',
'<(libchromiumcontent_src_dir)/third_party/WebKit',
'<(libchromiumcontent_dir)/gen',
],
},
'sources': [
@ -92,12 +92,10 @@
'common/main_delegate.h',
'common/main_delegate_mac.mm',
],
'conditions': [
['libchromiumcontent_component_build', {
'link_settings': {
'libraries': [ '<@(libchromiumcontent_shared_libraries)' ]
'libraries': [ '<@(libchromiumcontent_libraries)' ]
},
}],
'conditions': [
['OS=="linux"', {
'cflags_cc': [
'-Wno-deprecated-register',
@ -108,7 +106,7 @@
'<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
],
'libraries': [
'<(libchromiumcontent_library_dir)/libchromiumviews.a',
'<(libchromiumcontent_dir)/libchromiumviews.a',
'-lpthread',
'<!@(pkg-config --libs-only-l gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
],
@ -124,10 +122,10 @@
['OS=="win"', {
'link_settings': {
'libraries': [
'<(libchromiumcontent_library_dir)/base_static.lib',
'<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib',
'<(libchromiumcontent_library_dir)/chromiumviews.lib',
'<(libchromiumcontent_library_dir)/sandbox_static.lib',
'<(libchromiumcontent_dir)/base_static.lib',
'<(libchromiumcontent_dir)/chromiumcontent.dll.lib',
'<(libchromiumcontent_dir)/chromiumviews.lib',
'<(libchromiumcontent_dir)/sandbox_static.lib',
],
},
}],

42
brightray/brightray.gypi
View file

@ -3,17 +3,24 @@
'vendor/download/libchromiumcontent/filenames.gypi',
],
'variables': {
'libchromiumcontent_library_dir': '<(libchromiumcontent_dir)/Release',
'libchromiumcontent_include_dir': '<(libchromiumcontent_dir)/src',
'libchromiumcontent_resources_dir': '<(libchromiumcontent_library_dir)',
'libchromiumcontent_src_dir': '<(libchromiumcontent_dir)/src',
'libchromiumcontent_src_dir%': '<(libchromiumcontent_root_dir)/src',
'libchromiumcontent_component%': 1,
'conditions': [
# The "libchromiumcontent_component" is defined when calling "gyp".
['libchromiumcontent_component', {
'libchromiumcontent_dir%': '<(libchromiumcontent_root_dir)/shared_library',
'libchromiumcontent_libraries%': '<(libchromiumcontent_shared_libraries)',
'libchromiumcontent_shared_libraries': [],
}, {
'libchromiumcontent_dir%': '<(libchromiumcontent_root_dir)/static_library',
'libchromiumcontent_libraries%': '<(libchromiumcontent_static_libraries)',
'libchromiumcontent_static_libraries': [],
}],
],
'mac_deployment_target%': '10.8',
'mac_sdkroot%': 'macosx',
# Component build.
'libchromiumcontent_component_build%': 1,
# Build with clang under Linux.
'linux_clang%': 1,
@ -59,6 +66,10 @@
],
},
'configurations': {
# The "Debug" and "Release" configurations are not actually used.
'Debug': {},
'Release': {},
'Common_Base': {
'abstract': 1,
'defines': [
@ -109,13 +120,12 @@
}],
],
},
'Debug': {
'conditions': [
['libchromiumcontent_component', {
'RealDebug': {
'inherit_from': [
'Common_Base',
],
'variables': {
'libchromiumcontent_component_build': 1,
},
'msvs_settings': {
'VCCLCompilerTool': {
'Optimization': '<(win_debug_Optimization)',
@ -155,13 +165,11 @@
'GCC_OPTIMIZATION_LEVEL': '0',
},
},
'Release': {
}, {
'RealRelease': {
'inherit_from': [
'Common_Base',
],
'variables': {
'libchromiumcontent_component_build': 0,
},
'msvs_settings': {
'VCCLCompilerTool': {
'Optimization': '<(win_release_Optimization)',
@ -194,6 +202,8 @@
},
},
},
}],
],
},
'conditions': [
['OS!="mac"', {
@ -242,7 +252,7 @@
['OS=="win"', {
'target_defaults': {
'include_dirs': [
'<(libchromiumcontent_include_dir)/third_party/wtl/include',
'<(libchromiumcontent_src_dir)/third_party/wtl/include',
],
'defines': [
'_WIN32_WINNT=0x0602',

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 6b2945f386b1dae68b2b02ad7fc971f99a2f800b
Subproject commit cbc562c7a9c6a2a56f3a6ba08652f5e475898d48