Only do component build in Debug mode
This commit is contained in:
parent
7e41b9e44d
commit
faac37a85c
3 changed files with 15 additions and 4 deletions
|
@ -93,6 +93,11 @@
|
||||||
'common/main_delegate_mac.mm',
|
'common/main_delegate_mac.mm',
|
||||||
],
|
],
|
||||||
'conditions': [
|
'conditions': [
|
||||||
|
['libchromiumcontent_component_build', {
|
||||||
|
'link_settings': {
|
||||||
|
'libraries': [ '<@(libchromiumcontent_shared_libraries)' ]
|
||||||
|
},
|
||||||
|
}],
|
||||||
['OS=="linux"', {
|
['OS=="linux"', {
|
||||||
'cflags_cc': [
|
'cflags_cc': [
|
||||||
'-Wno-deprecated-register',
|
'-Wno-deprecated-register',
|
||||||
|
@ -103,7 +108,6 @@
|
||||||
'<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
|
'<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
|
||||||
],
|
],
|
||||||
'libraries': [
|
'libraries': [
|
||||||
'<@(libchromiumcontent_shared_libraries)',
|
|
||||||
'<(libchromiumcontent_library_dir)/libchromiumviews.a',
|
'<(libchromiumcontent_library_dir)/libchromiumviews.a',
|
||||||
'-lpthread',
|
'-lpthread',
|
||||||
'<!@(pkg-config --libs-only-l gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
|
'<!@(pkg-config --libs-only-l gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
|
||||||
|
@ -113,7 +117,6 @@
|
||||||
['OS=="mac"', {
|
['OS=="mac"', {
|
||||||
'link_settings': {
|
'link_settings': {
|
||||||
'libraries': [
|
'libraries': [
|
||||||
'<@(libchromiumcontent_shared_libraries)',
|
|
||||||
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
|
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
@ -121,7 +124,6 @@
|
||||||
['OS=="win"', {
|
['OS=="win"', {
|
||||||
'link_settings': {
|
'link_settings': {
|
||||||
'libraries': [
|
'libraries': [
|
||||||
'<@(libchromiumcontent_shared_libraries)',
|
|
||||||
'<(libchromiumcontent_library_dir)/base_static.lib',
|
'<(libchromiumcontent_library_dir)/base_static.lib',
|
||||||
'<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib',
|
'<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib',
|
||||||
'<(libchromiumcontent_library_dir)/chromiumviews.lib',
|
'<(libchromiumcontent_library_dir)/chromiumviews.lib',
|
||||||
|
|
|
@ -11,6 +11,9 @@
|
||||||
'mac_deployment_target%': '10.8',
|
'mac_deployment_target%': '10.8',
|
||||||
'mac_sdkroot%': 'macosx',
|
'mac_sdkroot%': 'macosx',
|
||||||
|
|
||||||
|
# Component build.
|
||||||
|
'libchromiumcontent_component_build%': 1,
|
||||||
|
|
||||||
# Build with clang under Linux.
|
# Build with clang under Linux.
|
||||||
'linux_clang%': 1,
|
'linux_clang%': 1,
|
||||||
|
|
||||||
|
@ -110,6 +113,9 @@
|
||||||
'inherit_from': [
|
'inherit_from': [
|
||||||
'Common_Base',
|
'Common_Base',
|
||||||
],
|
],
|
||||||
|
'variables': {
|
||||||
|
'libchromiumcontent_component_build': 1,
|
||||||
|
},
|
||||||
'msvs_settings': {
|
'msvs_settings': {
|
||||||
'VCCLCompilerTool': {
|
'VCCLCompilerTool': {
|
||||||
'Optimization': '<(win_debug_Optimization)',
|
'Optimization': '<(win_debug_Optimization)',
|
||||||
|
@ -153,6 +159,9 @@
|
||||||
'inherit_from': [
|
'inherit_from': [
|
||||||
'Common_Base',
|
'Common_Base',
|
||||||
],
|
],
|
||||||
|
'variables': {
|
||||||
|
'libchromiumcontent_component_build': 0,
|
||||||
|
},
|
||||||
'msvs_settings': {
|
'msvs_settings': {
|
||||||
'VCCLCompilerTool': {
|
'VCCLCompilerTool': {
|
||||||
'Optimization': '<(win_release_Optimization)',
|
'Optimization': '<(win_release_Optimization)',
|
||||||
|
|
2
brightray/vendor/libchromiumcontent
vendored
2
brightray/vendor/libchromiumcontent
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit e19d6d778ff3c574906b832102783cb80f5a43c1
|
Subproject commit 6b2945f386b1dae68b2b02ad7fc971f99a2f800b
|
Loading…
Reference in a new issue