diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/app_base.gypi | 104 |
1 files changed, 77 insertions, 27 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index 8e52e7a..2cf12fe1 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -3,11 +3,55 @@ # 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 + '../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/ui_base_paths.h', + '../ui/base/ui_base_paths.cc', + '../ui/base/ui_base_switches.h', + '../ui/base/ui_base_switches.cc', + 'app_paths.h', + 'app_paths.cc', + ], + 'conditions': [ + ['toolkit_uses_gtk!=1', { + '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', + ], + }], + ], + }], + ], + }, 'targets': [ { 'target_name': 'app_base', 'type': 'static_library', 'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE', + 'variables': { + 'app_base_target': 1, + }, '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 @@ -29,6 +73,13 @@ '../base/base.gyp:base', '../base/base.gyp:base_static', ], + # TODO(gregoryd): The direct_dependent_settings should be shared with + # the 64-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 '../ui/base/dragdrop/drag_drop_types_gtk.cc', @@ -93,10 +144,6 @@ '../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', @@ -109,10 +156,6 @@ '../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', @@ -124,8 +167,6 @@ '../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', 'mac/nsimage_cache.mm', 'mac/scoped_nsdisable_screen_updates.h', @@ -183,19 +224,6 @@ ], }], ], - }, { # 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!': [ @@ -271,15 +299,37 @@ { 'target_name': 'app_base_nacl_win64', 'type': 'static_library', + 'msvs_guid': '4987C6F9-B230-48E5-BF91-418EAE69AD90', + 'dependencies': [ + # app resources and ui_strings should be shared with the 32-bit + # target, but it doesn't work due to a bug in gyp + 'app_resources', + '../base/base.gyp:base_nacl_win64', + '../ui/base/strings/ui_strings.gyp:ui_strings', + ], + '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': [ '../ui/base/resource/resource_bundle_dummy.cc', - '../ui/base/ui_base_switches.h', - '../ui/base/ui_base_switches.cc', - 'app_paths.h', - 'app_paths.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_Base': { |