app/app_base.gypi - Issue 460083: Split app.gyp and add a Win64 version of the app_base target....

Unified Diff: app/app_base.gypi

Issue 460083: Split app.gyp and add a Win64 version of the app_base target.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: app/app_base.gypi

===================================================================

--- app/app_base.gypi (revision 0)

+++ app/app_base.gypi (revision 0)

@@ -0,0 +1,289 @@

+# Use of this source code is governed by a BSD-style license that can be

+# found in the LICENSE file.

+ 'target_defaults': {

+ 'variables': {

+ 'app_base_target': 0,

+ },

+ 'target_conditions': [

+ # This part is shared between the targets defined below. Only files and

+ # settings relevant for building the Win64 target should be added here.

+ # All the rest should be added to the 'app_base' target below.

+ ['app_base_target==1', {

+ 'sources': [

+ # Used both for Chrome and for Win64 NaCl loader

+ 'app_paths.h',

+ 'app_paths.cc',

+ 'app_switches.h',

+ 'app_switches.cc',

+ 'hi_res_timer_manager_posix.cc',

+ 'hi_res_timer_manager_win.cc',

+ 'hi_res_timer_manager.h',

+ 'system_monitor.cc',

+ 'system_monitor.h',

+ 'system_monitor_posix.cc',

+ 'system_monitor_win.cc',

+ 'tree_model.h',

+ 'tree_node_iterator.h',

+ 'tree_node_model.h',

+ 'win/window_impl.cc',

+ 'win/window_impl.h',

+ ],

+ 'include_dirs': [

+ '..',

+ '../chrome/third_party/wtl/include',

+ ],

+ 'conditions': [

+ ['OS=="win"', {

+ 'sources': [

+ 'win_util.cc',

+ 'win_util.h',

+ ],

+ }],

+ ['OS!="linux"', {

+ 'sources!': [

+ 'gfx/gtk_util.cc',

+ 'gfx/gtk_util.h',

+ 'gtk_dnd_util.cc',

+ 'gtk_dnd_util.h',

+ ],

+ }],

+ ],

+ }],

+ ],

+ },

+ 'targets': [

+ {

+ 'target_name': 'app_base',

+ 'type': '<(library)',

+ 'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE',

+ 'variables': {

+ 'app_base_target': 1,

+ },

+ 'dependencies': [

+ # app resources and app_strings should be shared with the 64-bit

+ # target, but it doesn't work due to a bug in gyp

+ 'app_resources',

+ 'app_strings',

+ '../base/base.gyp:base',

+ '../base/base.gyp:base_i18n',

+ '../net/net.gyp:net',

+ '../skia/skia.gyp:skia',

+ '../third_party/icu/icu.gyp:icui18n',

+ '../third_party/icu/icu.gyp:icuuc',

+ '../third_party/libjpeg/libjpeg.gyp:libjpeg',

+ '../third_party/libpng/libpng.gyp:libpng',

+ '../third_party/sqlite/sqlite.gyp:sqlite',

+ '../third_party/zlib/zlib.gyp:zlib',

+ ],

+ # TODO(gregoryd)The direct_dependent_settings should be shared with

+ # the 32-bit target, but it doesn't work due to a bug in gyp

+ 'direct_dependent_settings': {

+ 'include_dirs': [

+ '..',

+ ],

+ },

+ 'sources': [

+ # Files that are not required for Win64 Native Client loader

+ 'animation.cc',

+ 'animation.h',

+ 'active_window_watcher_x.cc',

+ 'active_window_watcher_x.h',

+ 'clipboard/clipboard.cc',

+ 'clipboard/clipboard.h',

+ 'clipboard/clipboard_linux.cc',

+ 'clipboard/clipboard_mac.mm',

+ 'clipboard/clipboard_util_win.cc',

+ 'clipboard/clipboard_util_win.h',

+ 'clipboard/clipboard_win.cc',

+ 'clipboard/scoped_clipboard_writer.cc',

+ 'clipboard/scoped_clipboard_writer.h',

+ 'combobox_model.h',

+ 'drag_drop_types_gtk.cc',

+ 'drag_drop_types_win.cc',

+ 'drag_drop_types.h',

+ 'gfx/blit.cc',

+ 'gfx/blit.h',

+ 'gfx/canvas.cc',

+ 'gfx/canvas.h',

+ 'gfx/canvas_linux.cc',

+ 'gfx/canvas_mac.mm',

+ 'gfx/canvas_win.cc',

+ 'gfx/codec/jpeg_codec.cc',

+ 'gfx/codec/jpeg_codec.h',

+ 'gfx/codec/png_codec.cc',

+ 'gfx/codec/png_codec.h',

+ 'gfx/color_utils.cc',

+ 'gfx/color_utils.h',

+ 'gfx/favicon_size.h',

+ 'gfx/font.h',

+ 'gfx/font_gtk.cc',

+ 'gfx/font_mac.mm',

+ 'gfx/font_skia.cc',

+ 'gfx/font_util.h',

+ 'gfx/font_util.cc',

+ 'gfx/font_win.cc',

+ 'gfx/gdi_util.cc',

+ 'gfx/gdi_util.h',

+ 'gfx/gtk_util.cc',

+ 'gfx/gtk_util.h',

+ 'gfx/icon_util.cc',

+ 'gfx/icon_util.h',

+ 'gfx/insets.h',

+ 'gfx/native_widget_types.h',

+ 'gfx/native_widget_types_gtk.cc',

+ 'gfx/native_theme_win.cc',

+ 'gfx/native_theme_win.h',

+ 'gfx/gtk_native_view_id_manager.cc',

+ 'gfx/gtk_native_view_id_manager.h',

+ 'gfx/path.cc',

+ 'gfx/path_gtk.cc',

+ 'gfx/path_win.cc',

+ 'gfx/path.h',

+ 'gfx/skbitmap_operations.cc',

+ 'gfx/skbitmap_operations.h',

+ 'gfx/text_elider.cc',

+ 'gfx/text_elider.h',

+ 'gtk_dnd_util.cc',

+ 'gtk_dnd_util.h',

+ 'l10n_util.cc',

+ 'l10n_util.h',

+ 'l10n_util_mac.h',

+ 'l10n_util_mac.mm',

+ 'l10n_util_posix.cc',

+ 'l10n_util_win.cc',

+ 'l10n_util_win.h',

+ 'menus/accelerator.h',

+ 'menus/menu_model.cc',

+ 'menus/menu_model.h',

+ 'menus/simple_menu_model.cc',

+ 'menus/simple_menu_model.h',

+ 'message_box_flags.h',

+ 'os_exchange_data_provider_gtk.cc',

+ 'os_exchange_data_provider_gtk.h',

+ 'os_exchange_data_provider_win.cc',

+ 'os_exchange_data_provider_win.h',

+ 'os_exchange_data.cc',

+ 'os_exchange_data.h',

+ 'resource_bundle.cc',

+ 'resource_bundle.h',

+ 'resource_bundle_linux.cc',

+ 'resource_bundle_mac.mm',

+ 'resource_bundle_posix.cc',

+ 'resource_bundle_win.cc',

+ 'slide_animation.cc',

+ 'slide_animation.h',

+ 'sql/connection.cc',

+ 'sql/connection.h',

+ 'sql/meta_table.cc',

+ 'sql/meta_table.h',

+ 'sql/statement.cc',

+ 'sql/statement.h',

+ 'sql/transaction.cc',

+ 'sql/transaction.h',

+ 'table_model.cc',

+ 'table_model.h',

+ 'table_model_observer.h',

+ 'theme_provider.cc',

+ 'theme_provider.h',

+ 'throb_animation.cc',

+ 'throb_animation.h',

+ ],

+ 'conditions': [

+ ['OS=="linux"', {

+ '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',

+ ],

+ 'conditions': [

+ ['toolkit_views==0 and chromeos==0', {

+ # Note: because of gyp predence rules this has to be defined as

+ # 'sources/' rather than 'sources!'.

+ 'sources/': [

+ ['exclude', '^os_exchange_data.cc'],

+ ['exclude', '^os_exchange_data.h'],

+ ['exclude', '^os_exchange_data_provider_gtk.cc'],

+ ['exclude', '^os_exchange_data_provider_gtk.h'],

+ ['exclude', '^drag_drop_types_gtk.cc'],

+ ],

+ }],

+ ['toolkit_views==1 or chromeos==1', {

+ # Note: because of gyp predence rules this has to be defined as

+ # 'sources/' rather than 'sources!'.

+ 'sources/': [

+ ['include', '^os_exchange_data.cc'],

+ ],

+ }],

+ ],

+ }],

+ ['OS!="win"', {

+ 'sources!': [

+ 'drag_drop_types.h',

+ 'gfx/gdi_util.cc',

+ 'gfx/gdi_util.h',

+ 'gfx/icon_util.cc',

+ 'gfx/icon_util.h',

+ 'gfx/native_theme_win.cc',

+ 'gfx/native_theme_win.h',

+ 'os_exchange_data.cc',

+ 'win/window_impl.cc',

+ 'win/window_impl.h',

+ ],

+ }],

+ ],

+ },

+ ],

+ 'conditions': [

+ ['OS=="win"', {

+ 'targets': [

+ {

+ 'target_name': 'app_base_nacl_win64',

+ 'type': '<(library)',

+ 'msvs_guid': '4987C6F9-B230-48E5-BF91-418EAE69AD90',

+ 'dependencies': [

+ # app resources and app_strings should be shared with the 32-bit

+ # target, but it doesn't work due to a bug in gyp

+ 'app_resources',

+ 'app_strings',

+ '../base/base.gyp:base_nacl_win64',

+ ],

+ 'variables': {

+ 'app_base_target': 1,

+ },

+ 'defines': [

+ '<@(nacl_win64_defines)',

+ ],

+ # TODO(gregoryd)The direct_dependent_settings should be shared with

+ # the 32-bit target, but it doesn't work due to a bug in gyp

+ 'direct_dependent_settings': {

+ 'include_dirs': [

+ '..',

+ ],

+ },

+ 'sources': [

+ 'l10n_util_dummy.cc',

+ 'resource_bundle_dummy.cc',

+ ],

+ 'include_dirs': [

+ '../skia/config/win',

+ '../third_party/icu/public/common',

+ '../third_party/icu/public/i18n',

+ '../third_party/npapi',

+ '../third_party/skia/include/config',

+ '../third_party/skia/include/core',

+ ],

+ 'configurations': {

+ 'Common': {

+ 'msvs_target_platform': 'x64',

+ },

+ ],

+ }],

+ ],

Property changes on: app\app_base.gypi

___________________________________________________________________

Added: svn:eol-style

+ LF

« no previous file with comments | « app/app.gyp ('k') | app/l10n_util_dummy.cc » ('j') | no next file with comments »