Files that are in src/ui/base should be compiled into libui_base.a.
Move files that are still in app_base over to ui_base. Take 2: Relanding after fixing a dependency in leveldb. Original change at http://codereview.chromium.org/7082017 BUG=72317 Review URL: http://codereview.chromium.org/7077034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87671 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
tony@chromium.org
app
chrome
printing
tools/memory_watcher
ui
@ -9,20 +9,13 @@
|
||||
'type': 'static_library',
|
||||
'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE',
|
||||
'dependencies': [
|
||||
# app resources and ui_strings should be shared with the 64-bit
|
||||
# target, but it doesn't work due to a bug in gyp
|
||||
'../base/base.gyp:base',
|
||||
'../base/base.gyp:base_i18n',
|
||||
'../base/base.gyp:base_static',
|
||||
'../ui/ui.gyp:ui_gfx',
|
||||
'../net/net.gyp:net',
|
||||
'../skia/skia.gyp:skia',
|
||||
'../third_party/icu/icu.gyp:icui18n',
|
||||
'../third_party/icu/icu.gyp:icuuc',
|
||||
'../third_party/libpng/libpng.gyp:libpng',
|
||||
'../third_party/sqlite/sqlite.gyp:sqlite',
|
||||
'../third_party/zlib/zlib.gyp:zlib',
|
||||
'../ui/base/strings/ui_strings.gyp:ui_strings',
|
||||
'<(libjpeg_gyp_path):libjpeg',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
@ -30,100 +23,6 @@
|
||||
'../base/base.gyp:base_static',
|
||||
],
|
||||
'sources': [
|
||||
# Files that are not required for Win64 Native Client loader
|
||||
'../ui/base/dragdrop/drag_drop_types_gtk.cc',
|
||||
'../ui/base/dragdrop/drag_drop_types_win.cc',
|
||||
'../ui/base/dragdrop/drag_drop_types.h',
|
||||
'../ui/base/dragdrop/drag_source.cc',
|
||||
'../ui/base/dragdrop/drag_source.h',
|
||||
'../ui/base/dragdrop/drop_target.cc',
|
||||
'../ui/base/dragdrop/drop_target.h',
|
||||
'../ui/base/dragdrop/gtk_dnd_util.cc',
|
||||
'../ui/base/dragdrop/gtk_dnd_util.h',
|
||||
'../ui/base/dragdrop/os_exchange_data_provider_gtk.cc',
|
||||
'../ui/base/dragdrop/os_exchange_data_provider_gtk.h',
|
||||
'../ui/base/dragdrop/os_exchange_data_provider_win.cc',
|
||||
'../ui/base/dragdrop/os_exchange_data_provider_win.h',
|
||||
'../ui/base/dragdrop/os_exchange_data.cc',
|
||||
'../ui/base/dragdrop/os_exchange_data.h',
|
||||
'../ui/base/events.h',
|
||||
'../ui/base/gtk/event_synthesis_gtk.cc',
|
||||
'../ui/base/gtk/event_synthesis_gtk.h',
|
||||
'../ui/base/gtk/gtk_signal.h',
|
||||
'../ui/base/gtk/gtk_signal_registrar.cc',
|
||||
'../ui/base/gtk/gtk_signal_registrar.h',
|
||||
'../ui/base/gtk/gtk_windowing.cc',
|
||||
'../ui/base/gtk/gtk_windowing.h',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_gtk.cc',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_gtk.h',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_mac.mm',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_mac.h',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_win.cc',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_win.h',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_x.cc',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_x.h',
|
||||
'../ui/base/keycodes/keyboard_codes.h',
|
||||
'../ui/base/keycodes/keyboard_codes_win.h',
|
||||
'../ui/base/keycodes/keyboard_codes_posix.h',
|
||||
'../ui/base/l10n/l10n_font_util.h',
|
||||
'../ui/base/l10n/l10n_font_util.cc',
|
||||
'../ui/base/l10n/l10n_util.cc',
|
||||
'../ui/base/l10n/l10n_util.h',
|
||||
'../ui/base/l10n/l10n_util_collator.h',
|
||||
'../ui/base/l10n/l10n_util_mac.h',
|
||||
'../ui/base/l10n/l10n_util_mac.mm',
|
||||
'../ui/base/l10n/l10n_util_posix.cc',
|
||||
'../ui/base/l10n/l10n_util_win.cc',
|
||||
'../ui/base/l10n/l10n_util_win.h',
|
||||
'../ui/base/message_box_flags.h',
|
||||
'../ui/base/message_box_win.cc',
|
||||
'../ui/base/message_box_win.h',
|
||||
'../ui/base/models/accelerator.h',
|
||||
'../ui/base/models/accelerator_gtk.h',
|
||||
'../ui/base/models/accelerator_cocoa.mm',
|
||||
'../ui/base/models/accelerator_cocoa.h',
|
||||
'../ui/base/models/button_menu_item_model.cc',
|
||||
'../ui/base/models/button_menu_item_model.h',
|
||||
'../ui/base/models/menu_model.cc',
|
||||
'../ui/base/models/menu_model.h',
|
||||
'../ui/base/models/menu_model_delegate.h',
|
||||
'../ui/base/models/simple_menu_model.cc',
|
||||
'../ui/base/models/simple_menu_model.h',
|
||||
'../ui/base/models/combobox_model.h',
|
||||
'../ui/base/models/table_model.cc',
|
||||
'../ui/base/models/table_model.h',
|
||||
'../ui/base/models/table_model_observer.h',
|
||||
'../ui/base/models/tree_model.cc',
|
||||
'../ui/base/models/tree_model.h',
|
||||
'../ui/base/models/tree_node_iterator.h',
|
||||
'../ui/base/models/tree_node_model.h',
|
||||
'../ui/base/resource/data_pack.cc',
|
||||
'../ui/base/resource/data_pack.h',
|
||||
'../ui/base/resource/resource_bundle.cc',
|
||||
'../ui/base/resource/resource_bundle.h',
|
||||
'../ui/base/resource/resource_bundle_linux.cc',
|
||||
'../ui/base/resource/resource_bundle_mac.mm',
|
||||
'../ui/base/resource/resource_bundle_posix.cc',
|
||||
'../ui/base/resource/resource_bundle_win.cc',
|
||||
'../ui/base/text/text_elider.cc',
|
||||
'../ui/base/text/text_elider.h',
|
||||
'../ui/base/theme_provider.cc',
|
||||
'../ui/base/theme_provider.h',
|
||||
'../ui/base/ui_base_paths.h',
|
||||
'../ui/base/ui_base_paths.cc',
|
||||
'../ui/base/ui_base_switches.h',
|
||||
'../ui/base/ui_base_switches.cc',
|
||||
'../ui/base/view_prop.cc',
|
||||
'../ui/base/view_prop.h',
|
||||
'../ui/base/win/hwnd_util.cc',
|
||||
'../ui/base/win/hwnd_util.h',
|
||||
'../ui/base/win/window_impl.cc',
|
||||
'../ui/base/win/window_impl.h',
|
||||
'../ui/base/x/active_window_watcher_x.cc',
|
||||
'../ui/base/x/active_window_watcher_x.h',
|
||||
'../ui/base/x/x11_util.cc',
|
||||
'../ui/base/x/x11_util.h',
|
||||
'../ui/base/x/x11_util_internal.h',
|
||||
'app_paths.h',
|
||||
'app_paths.cc',
|
||||
'mac/nsimage_cache.h',
|
||||
@ -148,121 +47,6 @@
|
||||
'win/shell.cc',
|
||||
'win/shell.h',
|
||||
],
|
||||
'conditions': [
|
||||
['toolkit_uses_gtk==1', {
|
||||
'dependencies': [
|
||||
# font_gtk.cc uses fontconfig.
|
||||
# TODO(evanm): I think this is wrong; it should just use GTK.
|
||||
'../build/linux/system.gyp:fontconfig',
|
||||
'../build/linux/system.gyp:gtk',
|
||||
'../build/linux/system.gyp:x11',
|
||||
'../build/linux/system.gyp:xext',
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-lXrender', # For XRender* function calls in x11_util.cc.
|
||||
],
|
||||
},
|
||||
'conditions': [
|
||||
['toolkit_views==0', {
|
||||
# Note: because of gyp predence rules this has to be defined as
|
||||
# 'sources/' rather than 'sources!'.
|
||||
'sources/': [
|
||||
['exclude', '^../ui/base/dragdrop/drag_drop_types_gtk.cc'],
|
||||
['exclude', '^../ui/base/dragdrop/os_exchange_data.cc'],
|
||||
['exclude', '^../ui/base/dragdrop/os_exchange_data.h'],
|
||||
['exclude', '^../ui/base/dragdrop/os_exchange_data_provider_gtk.cc'],
|
||||
['exclude', '^../ui/base/dragdrop/os_exchange_data_provider_gtk.h'],
|
||||
],
|
||||
}],
|
||||
['toolkit_views==1', {
|
||||
# Note: because of gyp predence rules this has to be defined as
|
||||
# 'sources/' rather than 'sources!'.
|
||||
'sources/': [
|
||||
['include', '^../ui/base/dragdrop/os_exchange_data.cc'],
|
||||
],
|
||||
}],
|
||||
],
|
||||
}, { # toolkit_uses_gtk==0
|
||||
'sources!': [
|
||||
'../ui/base/dragdrop/gtk_dnd_util.cc',
|
||||
'../ui/base/dragdrop/gtk_dnd_util.h',
|
||||
'../ui/base/gtk/gtk_signal.h',
|
||||
'../ui/base/gtk/gtk_signal_registrar.cc',
|
||||
'../ui/base/gtk/gtk_signal_registrar.h',
|
||||
'../ui/base/gtk/gtk_windowing.cc',
|
||||
'../ui/base/gtk/gtk_windowing.h',
|
||||
'../ui/base/x/x11_util.cc',
|
||||
'../ui/base/x/x11_util.h',
|
||||
'../ui/base/x/x11_util_internal.h',
|
||||
],
|
||||
}],
|
||||
['OS!="win"', {
|
||||
'sources!': [
|
||||
'../ui/base/dragdrop/drag_source.cc',
|
||||
'../ui/base/dragdrop/drag_source.h',
|
||||
'../ui/base/dragdrop/drag_drop_types.h',
|
||||
'../ui/base/dragdrop/drop_target.cc',
|
||||
'../ui/base/dragdrop/drop_target.h',
|
||||
'../ui/base/dragdrop/os_exchange_data.cc',
|
||||
'../ui/base/view_prop.cc',
|
||||
'../ui/base/view_prop.h',
|
||||
'win/iat_patch_function.cc',
|
||||
'win/iat_patch_function.h',
|
||||
],
|
||||
'sources/': [
|
||||
['exclude', '^win/*'],
|
||||
],
|
||||
}],
|
||||
['use_x11==1', {
|
||||
'sources!': [
|
||||
'../ui/base/keycodes/keyboard_code_conversion_mac.mm',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_mac.h',
|
||||
'../ui/base/keycodes/keyboard_codes_win.h',
|
||||
],
|
||||
'all_dependent_settings': {
|
||||
'ldflags': [
|
||||
'-L<(PRODUCT_DIR)',
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-lX11',
|
||||
'-ldl',
|
||||
],
|
||||
},
|
||||
},
|
||||
}],
|
||||
['OS=="mac"', {
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
|
||||
'$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
|
||||
],
|
||||
},
|
||||
'sources!': [
|
||||
'../ui/base/keycodes/keyboard_code_conversion_gtk.cc',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_gtk.h',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_x.cc',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_x.h',
|
||||
'../ui/base/keycodes/keyboard_codes_win.h',
|
||||
'../ui/base/gtk/event_synthesis_gtk.cc',
|
||||
'../ui/base/gtk/event_synthesis_gtk.h',
|
||||
],
|
||||
}],
|
||||
['OS=="win"', {
|
||||
'sources!': [
|
||||
'../ui/base/keycodes/keyboard_code_conversion_gtk.cc',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_gtk.h',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_mac.mm',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_mac.h',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_x.cc',
|
||||
'../ui/base/keycodes/keyboard_code_conversion_x.h',
|
||||
'../ui/base/keycodes/keyboard_codes_posix.h',
|
||||
'../ui/base/gtk/event_synthesis_gtk.cc',
|
||||
'../ui/base/gtk/event_synthesis_gtk.h',
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
'conditions': [
|
||||
|
||||
@ -1163,7 +1163,7 @@
|
||||
'dependencies': [
|
||||
'chrome_strings',
|
||||
'../base/base.gyp:base',
|
||||
'../app/app.gyp:app_base',
|
||||
'../ui/ui.gyp:ui_base',
|
||||
],
|
||||
'include_dirs': [
|
||||
'<(grit_out_dir)',
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
'target_name': 'printing',
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'../app/app.gyp:app_base', # Only required for Font support
|
||||
'../base/base.gyp:base',
|
||||
'../base/base.gyp:base_i18n',
|
||||
'../build/temp_gyp/googleurl.gyp:googleurl',
|
||||
'../skia/skia.gyp:skia',
|
||||
'../third_party/icu/icu.gyp:icui18n',
|
||||
'../third_party/icu/icu.gyp:icuuc',
|
||||
'../ui/ui.gyp:ui_base', # Only required for Font support.
|
||||
],
|
||||
'msvs_guid': '9E5416B9-B91B-4029-93F4-102C1AD5CAF4',
|
||||
'include_dirs': [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
||||
# Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
'type': 'shared_library',
|
||||
'msvs_guid': '3BD81303-4E14-4559-AA69-B30C3BAB08DD',
|
||||
'dependencies': [
|
||||
'../../app/app.gyp:app_base',
|
||||
'../../base/base.gyp:base',
|
||||
'../../ui/ui.gyp:ui_base',
|
||||
],
|
||||
'defines': [
|
||||
'BUILD_MEMORY_WATCHER',
|
||||
|
||||
@ -36,9 +36,9 @@
|
||||
'target_name': 'gl',
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'<(DEPTH)/app/app.gyp:app_base',
|
||||
'<(DEPTH)/base/base.gyp:base',
|
||||
'<(DEPTH)/skia/skia.gyp:skia',
|
||||
'<(DEPTH)/ui/ui.gyp:ui_base',
|
||||
'<(DEPTH)/ui/ui.gyp:ui_gfx',
|
||||
],
|
||||
'variables': {
|
||||
|
||||
163
ui/ui_base.gypi
163
ui/ui_base.gypi
@ -9,9 +9,11 @@
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'../base/base.gyp:base',
|
||||
'../net/net.gyp:net',
|
||||
'../skia/skia.gyp:skia',
|
||||
'../third_party/icu/icu.gyp:icui18n',
|
||||
'../third_party/icu/icu.gyp:icuuc',
|
||||
'base/strings/ui_strings.gyp:ui_strings',
|
||||
'ui_gfx',
|
||||
],
|
||||
# Export these dependencies since text_elider.h includes ICU headers.
|
||||
@ -49,30 +51,183 @@
|
||||
'base/clipboard/clipboard_win.cc',
|
||||
'base/clipboard/scoped_clipboard_writer.cc',
|
||||
'base/clipboard/scoped_clipboard_writer.h',
|
||||
'base/dragdrop/drag_drop_types_gtk.cc',
|
||||
'base/dragdrop/drag_drop_types.h',
|
||||
'base/dragdrop/drag_drop_types_win.cc',
|
||||
'base/dragdrop/drag_source.cc',
|
||||
'base/dragdrop/drag_source.h',
|
||||
'base/dragdrop/drop_target.cc',
|
||||
'base/dragdrop/drop_target.h',
|
||||
'base/dragdrop/gtk_dnd_util.cc',
|
||||
'base/dragdrop/gtk_dnd_util.h',
|
||||
'base/dragdrop/os_exchange_data.cc',
|
||||
'base/dragdrop/os_exchange_data.h',
|
||||
'base/dragdrop/os_exchange_data_provider_gtk.cc',
|
||||
'base/dragdrop/os_exchange_data_provider_gtk.h',
|
||||
'base/dragdrop/os_exchange_data_provider_win.cc',
|
||||
'base/dragdrop/os_exchange_data_provider_win.h',
|
||||
'base/events.h',
|
||||
'base/gtk/event_synthesis_gtk.cc',
|
||||
'base/gtk/event_synthesis_gtk.h',
|
||||
'base/gtk/g_object_destructor_filo.cc',
|
||||
'base/gtk/g_object_destructor_filo.h',
|
||||
'base/gtk/gtk_im_context_util.cc',
|
||||
'base/gtk/gtk_im_context_util.h',
|
||||
'base/gtk/gtk_signal.h',
|
||||
'base/gtk/gtk_signal_registrar.cc',
|
||||
'base/gtk/gtk_signal_registrar.h',
|
||||
'base/gtk/gtk_windowing.cc',
|
||||
'base/gtk/gtk_windowing.h',
|
||||
'base/ime/composition_text.cc',
|
||||
'base/ime/composition_text.h',
|
||||
'base/ime/composition_underline.h',
|
||||
'base/ime/text_input_type.h',
|
||||
'base/keycodes/keyboard_code_conversion_gtk.cc',
|
||||
'base/keycodes/keyboard_code_conversion_gtk.h',
|
||||
'base/keycodes/keyboard_code_conversion_mac.h',
|
||||
'base/keycodes/keyboard_code_conversion_mac.mm',
|
||||
'base/keycodes/keyboard_code_conversion_win.cc',
|
||||
'base/keycodes/keyboard_code_conversion_win.h',
|
||||
'base/keycodes/keyboard_code_conversion_x.cc',
|
||||
'base/keycodes/keyboard_code_conversion_x.h',
|
||||
'base/keycodes/keyboard_codes.h',
|
||||
'base/l10n/l10n_font_util.cc',
|
||||
'base/l10n/l10n_font_util.h',
|
||||
'base/l10n/l10n_util.cc',
|
||||
'base/l10n/l10n_util.h',
|
||||
'base/l10n/l10n_util_collator.h',
|
||||
'base/l10n/l10n_util_mac.h',
|
||||
'base/l10n/l10n_util_mac.mm',
|
||||
'base/l10n/l10n_util_posix.cc',
|
||||
'base/l10n/l10n_util_win.cc',
|
||||
'base/l10n/l10n_util_win.h',
|
||||
'base/message_box_flags.h',
|
||||
'base/message_box_win.cc',
|
||||
'base/message_box_win.h',
|
||||
'base/models/accelerator_cocoa.h',
|
||||
'base/models/accelerator_cocoa.mm',
|
||||
'base/models/accelerator_gtk.h',
|
||||
'base/models/accelerator.h',
|
||||
'base/models/button_menu_item_model.cc',
|
||||
'base/models/button_menu_item_model.h',
|
||||
'base/models/combobox_model.h',
|
||||
'base/models/menu_model.cc',
|
||||
'base/models/menu_model.h',
|
||||
'base/models/menu_model_delegate.h',
|
||||
'base/models/simple_menu_model.cc',
|
||||
'base/models/simple_menu_model.h',
|
||||
'base/models/table_model.cc',
|
||||
'base/models/table_model.h',
|
||||
'base/models/table_model_observer.h',
|
||||
'base/models/tree_model.cc',
|
||||
'base/models/tree_model.h',
|
||||
'base/models/tree_node_iterator.h',
|
||||
'base/models/tree_node_model.h',
|
||||
'base/range/range.cc',
|
||||
'base/range/range.h',
|
||||
'base/range/range.mm',
|
||||
'base/resource/data_pack.cc',
|
||||
'base/resource/data_pack.h',
|
||||
'base/resource/resource_bundle.cc',
|
||||
'base/resource/resource_bundle.h',
|
||||
'base/resource/resource_bundle_linux.cc',
|
||||
'base/resource/resource_bundle_mac.mm',
|
||||
'base/resource/resource_bundle_posix.cc',
|
||||
'base/resource/resource_bundle_win.cc',
|
||||
'base/text/text_elider.cc',
|
||||
'base/text/text_elider.h',
|
||||
'base/theme_provider.cc',
|
||||
'base/theme_provider.h',
|
||||
'base/ui_base_paths.cc',
|
||||
'base/ui_base_paths.h',
|
||||
'base/ui_base_switches.cc',
|
||||
'base/ui_base_switches.h',
|
||||
'base/view_prop.cc',
|
||||
'base/view_prop.h',
|
||||
'base/win/hwnd_util.cc',
|
||||
'base/win/hwnd_util.h',
|
||||
'base/win/ime_input.cc',
|
||||
'base/win/ime_input.h',
|
||||
'base/win/window_impl.cc',
|
||||
'base/win/window_impl.h',
|
||||
'base/x/active_window_watcher_x.cc',
|
||||
'base/x/active_window_watcher_x.h',
|
||||
'base/x/x11_util.cc',
|
||||
'base/x/x11_util.h',
|
||||
'base/x/x11_util_internal.h',
|
||||
],
|
||||
'conditions': [
|
||||
['toolkit_uses_gtk == 1', {
|
||||
'dependencies': [
|
||||
'../build/linux/system.gyp:fontconfig',
|
||||
'../build/linux/system.gyp:gtk',
|
||||
'../build/linux/system.gyp:x11',
|
||||
'../build/linux/system.gyp:xext',
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-lXrender', # For XRender* function calls in x11_util.cc.
|
||||
],
|
||||
},
|
||||
'conditions': [
|
||||
['toolkit_views==0', {
|
||||
# Note: because of gyp predence rules this has to be defined as
|
||||
# 'sources/' rather than 'sources!'.
|
||||
'sources/': [
|
||||
['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'],
|
||||
['exclude', '^base/dragdrop/os_exchange_data.cc'],
|
||||
['exclude', '^base/dragdrop/os_exchange_data.h'],
|
||||
['exclude', '^base/dragdrop/os_exchange_data_provider_gtk.cc'],
|
||||
['exclude', '^base/dragdrop/os_exchange_data_provider_gtk.h'],
|
||||
],
|
||||
}, {
|
||||
# Note: because of gyp predence rules this has to be defined as
|
||||
# 'sources/' rather than 'sources!'.
|
||||
'sources/': [
|
||||
['include', '^base/dragdrop/os_exchange_data.cc'],
|
||||
],
|
||||
}],
|
||||
],
|
||||
}],
|
||||
['OS=="win"', {
|
||||
'sources': [
|
||||
'base/win/ime_input.cc',
|
||||
'base/win/ime_input.h',
|
||||
['OS!="win"', {
|
||||
'sources!': [
|
||||
'base/dragdrop/drag_source.cc',
|
||||
'base/dragdrop/drag_source.h',
|
||||
'base/dragdrop/drag_drop_types.h',
|
||||
'base/dragdrop/drop_target.cc',
|
||||
'base/dragdrop/drop_target.h',
|
||||
'base/dragdrop/os_exchange_data.cc',
|
||||
'base/view_prop.cc',
|
||||
'base/view_prop.h',
|
||||
],
|
||||
'sources/': [
|
||||
['exclude', '^base/win/*'],
|
||||
],
|
||||
}],
|
||||
['OS=="mac"', {
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
|
||||
'$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
|
||||
],
|
||||
},
|
||||
}],
|
||||
['use_x11==1', {
|
||||
'all_dependent_settings': {
|
||||
'ldflags': [
|
||||
'-L<(PRODUCT_DIR)',
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'-lX11',
|
||||
'-ldl',
|
||||
],
|
||||
},
|
||||
},
|
||||
}, { # use_x11==0
|
||||
'sources!': [
|
||||
'base/keycodes/keyboard_code_conversion_x.cc',
|
||||
'base/keycodes/keyboard_code_conversion_x.h',
|
||||
],
|
||||
}],
|
||||
],
|
||||
|
||||
@ -92,7 +92,6 @@
|
||||
}],
|
||||
['toolkit_uses_gtk == 1', {
|
||||
'dependencies': [
|
||||
'../app/app.gyp:app_base',
|
||||
'../build/linux/system.gyp:gtk',
|
||||
],
|
||||
'conditions': [
|
||||
|
||||
Reference in New Issue
Block a user