Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(384)

Side by Side Diff: app/app_base.gypi

Issue 466059: Revert "Split app.gyp and add a Win64 version of the app_base target." (Closed)
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 unified diff | Download patch
« no previous file with comments | « app/app.gyp ('k') | app/l10n_util_dummy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file.
4
5 {
6 'target_defaults': {
7 'variables': {
8 'app_base_target': 0,
9 },
10 'target_conditions': [
11 # This part is shared between the targets defined below. Only files and
12 # settings relevant for building the Win64 target should be added here.
13 # All the rest should be added to the 'app_base' target below.
14 ['app_base_target==1', {
15 'sources': [
16 # Used both for Chrome and for Win64 NaCl loader
17 'app_paths.h',
18 'app_paths.cc',
19 'app_switches.h',
20 'app_switches.cc',
21 'hi_res_timer_manager_posix.cc',
22 'hi_res_timer_manager_win.cc',
23 'hi_res_timer_manager.h',
24 'system_monitor.cc',
25 'system_monitor.h',
26 'system_monitor_posix.cc',
27 'system_monitor_win.cc',
28 'tree_model.h',
29 'tree_node_iterator.h',
30 'tree_node_model.h',
31 'win/window_impl.cc',
32 'win/window_impl.h',
33 ],
34 'include_dirs': [
35 '..',
36 '../chrome/third_party/wtl/include',
37 ],
38 'direct_dependent_settings': {
39 'include_dirs': [
40 '..',
41 ],
42 },
43 'conditions': [
44 ['OS=="win"', {
45 'sources': [
46 'win_util.cc',
47 'win_util.h',
48 ],
49 }],
50 ['OS!="linux"', {
51 'sources!': [
52 'gfx/gtk_util.cc',
53 'gfx/gtk_util.h',
54 'gtk_dnd_util.cc',
55 'gtk_dnd_util.h',
56 ],
57 }],
58 ],
59 }],
60 ],
61 },
62 'targets': [
63 {
64 'target_name': 'app_base',
65 'type': '<(library)',
66 'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE',
67 'variables': {
68 'app_base_target': 1,
69 },
70 'dependencies': [
71 # app resources and app_strings should be shared with the 64-bit
72 # target, but it doesn't work due to a bug in gyp
73 'app_resources',
74 'app_strings',
75 '../base/base.gyp:base',
76 '../base/base.gyp:base_i18n',
77 '../net/net.gyp:net',
78 '../skia/skia.gyp:skia',
79 '../third_party/icu/icu.gyp:icui18n',
80 '../third_party/icu/icu.gyp:icuuc',
81 '../third_party/libjpeg/libjpeg.gyp:libjpeg',
82 '../third_party/libpng/libpng.gyp:libpng',
83 '../third_party/sqlite/sqlite.gyp:sqlite',
84 '../third_party/zlib/zlib.gyp:zlib',
85 ],
86 'sources': [
87 # Files that are not required for Win64 Native Client loader
88 'animation.cc',
89 'animation.h',
90 'active_window_watcher_x.cc',
91 'active_window_watcher_x.h',
92 'clipboard/clipboard.cc',
93 'clipboard/clipboard.h',
94 'clipboard/clipboard_linux.cc',
95 'clipboard/clipboard_mac.mm',
96 'clipboard/clipboard_util_win.cc',
97 'clipboard/clipboard_util_win.h',
98 'clipboard/clipboard_win.cc',
99 'clipboard/scoped_clipboard_writer.cc',
100 'clipboard/scoped_clipboard_writer.h',
101 'combobox_model.h',
102 'drag_drop_types_gtk.cc',
103 'drag_drop_types_win.cc',
104 'drag_drop_types.h',
105 'gfx/blit.cc',
106 'gfx/blit.h',
107 'gfx/canvas.cc',
108 'gfx/canvas.h',
109 'gfx/canvas_linux.cc',
110 'gfx/canvas_mac.mm',
111 'gfx/canvas_win.cc',
112 'gfx/codec/jpeg_codec.cc',
113 'gfx/codec/jpeg_codec.h',
114 'gfx/codec/png_codec.cc',
115 'gfx/codec/png_codec.h',
116 'gfx/color_utils.cc',
117 'gfx/color_utils.h',
118 'gfx/favicon_size.h',
119 'gfx/font.h',
120 'gfx/font_gtk.cc',
121 'gfx/font_mac.mm',
122 'gfx/font_skia.cc',
123 'gfx/font_util.h',
124 'gfx/font_util.cc',
125 'gfx/font_win.cc',
126 'gfx/gdi_util.cc',
127 'gfx/gdi_util.h',
128 'gfx/gtk_util.cc',
129 'gfx/gtk_util.h',
130 'gfx/icon_util.cc',
131 'gfx/icon_util.h',
132 'gfx/insets.h',
133 'gfx/native_widget_types.h',
134 'gfx/native_widget_types_gtk.cc',
135 'gfx/native_theme_win.cc',
136 'gfx/native_theme_win.h',
137 'gfx/gtk_native_view_id_manager.cc',
138 'gfx/gtk_native_view_id_manager.h',
139 'gfx/path.cc',
140 'gfx/path_gtk.cc',
141 'gfx/path_win.cc',
142 'gfx/path.h',
143 'gfx/skbitmap_operations.cc',
144 'gfx/skbitmap_operations.h',
145 'gfx/text_elider.cc',
146 'gfx/text_elider.h',
147 'gtk_dnd_util.cc',
148 'gtk_dnd_util.h',
149 'l10n_util.cc',
150 'l10n_util.h',
151 'l10n_util_mac.h',
152 'l10n_util_mac.mm',
153 'l10n_util_posix.cc',
154 'l10n_util_win.cc',
155 'l10n_util_win.h',
156 'menus/accelerator.h',
157 'menus/menu_model.cc',
158 'menus/menu_model.h',
159 'menus/simple_menu_model.cc',
160 'menus/simple_menu_model.h',
161 'message_box_flags.h',
162 'os_exchange_data_provider_gtk.cc',
163 'os_exchange_data_provider_gtk.h',
164 'os_exchange_data_provider_win.cc',
165 'os_exchange_data_provider_win.h',
166 'os_exchange_data.cc',
167 'os_exchange_data.h',
168 'resource_bundle.cc',
169 'resource_bundle.h',
170 'resource_bundle_linux.cc',
171 'resource_bundle_mac.mm',
172 'resource_bundle_posix.cc',
173 'resource_bundle_win.cc',
174 'slide_animation.cc',
175 'slide_animation.h',
176 'sql/connection.cc',
177 'sql/connection.h',
178 'sql/meta_table.cc',
179 'sql/meta_table.h',
180 'sql/statement.cc',
181 'sql/statement.h',
182 'sql/transaction.cc',
183 'sql/transaction.h',
184 'table_model.cc',
185 'table_model.h',
186 'table_model_observer.h',
187 'theme_provider.cc',
188 'theme_provider.h',
189 'throb_animation.cc',
190 'throb_animation.h',
191 ],
192 'conditions': [
193 ['OS=="linux"', {
194 'dependencies': [
195 # font_gtk.cc uses fontconfig.
196 # TODO(evanm): I think this is wrong; it should just use GTK.
197 '../build/linux/system.gyp:fontconfig',
198 '../build/linux/system.gyp:gtk',
199 '../build/linux/system.gyp:x11',
200 ],
201 'conditions': [
202 ['toolkit_views==0 and chromeos==0', {
203 # Note: because of gyp predence rules this has to be defined as
204 # 'sources/' rather than 'sources!'.
205 'sources/': [
206 ['exclude', '^os_exchange_data.cc'],
207 ['exclude', '^os_exchange_data.h'],
208 ['exclude', '^os_exchange_data_provider_gtk.cc'],
209 ['exclude', '^os_exchange_data_provider_gtk.h'],
210 ['exclude', '^drag_drop_types_gtk.cc'],
211 ],
212 }],
213 ['toolkit_views==1 or chromeos==1', {
214 # Note: because of gyp predence rules this has to be defined as
215 # 'sources/' rather than 'sources!'.
216 'sources/': [
217 ['include', '^os_exchange_data.cc'],
218 ],
219 }],
220 ],
221 }],
222 ['OS!="win"', {
223 'sources!': [
224 'drag_drop_types.h',
225 'gfx/gdi_util.cc',
226 'gfx/gdi_util.h',
227 'gfx/icon_util.cc',
228 'gfx/icon_util.h',
229 'gfx/native_theme_win.cc',
230 'gfx/native_theme_win.h',
231 'os_exchange_data.cc',
232 'win/window_impl.cc',
233 'win/window_impl.h',
234 ],
235 }],
236 ],
237 },
238 ],
239 'conditions': [
240 ['OS=="win"', {
241 'targets': [
242 {
243 'target_name': 'app_base_nacl_win64',
244 'type': '<(library)',
245 'msvs_guid': '4987C6F9-B230-48E5-BF91-418EAE69AD90',
246 'dependencies': [
247 # app resources and app_strings should be shared with the 32-bit
248 # target, but it doesn't work due to a bug in gyp
249 'app_resources',
250 'app_strings',
251 '../base/base.gyp:base_nacl_win64',
252 ],
253 'variables': {
254 'app_base_target': 1,
255 },
256 'defines': [
257 '<@(nacl_win64_defines)',
258 ],
259 'sources': [
260 'l10n_util_dummy.cc',
261 'resource_bundle_dummy.cc',
262 ],
263 'include_dirs': [
264 '../skia/config/win',
265 '../third_party/icu/public/common',
266 '../third_party/icu/public/i18n',
267 '../third_party/npapi',
268 '../third_party/skia/include/config',
269 '../third_party/skia/include/core',
270 ],
271 'configurations': {
272 'Common': {
273 'msvs_target_platform': 'x64',
274 },
275 },
276 },
277 ],
278 }],
279 ],
280 }
OLDNEW
« no previous file with comments | « app/app.gyp ('k') | app/l10n_util_dummy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698