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

Side by Side Diff: app/app_base.gypi

Issue 3165064: Move the keyboard files from base/ to app/. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: latest merge Created 10 years, 4 months 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 | « no previous file | app/event_synthesis_gtk.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'app_base_target': 0, 8 'app_base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 'clipboard/clipboard_mac.mm', 109 'clipboard/clipboard_mac.mm',
110 'clipboard/clipboard_util_win.cc', 110 'clipboard/clipboard_util_win.cc',
111 'clipboard/clipboard_util_win.h', 111 'clipboard/clipboard_util_win.h',
112 'clipboard/clipboard_win.cc', 112 'clipboard/clipboard_win.cc',
113 'clipboard/scoped_clipboard_writer.cc', 113 'clipboard/scoped_clipboard_writer.cc',
114 'clipboard/scoped_clipboard_writer.h', 114 'clipboard/scoped_clipboard_writer.h',
115 'combobox_model.h', 115 'combobox_model.h',
116 'drag_drop_types_gtk.cc', 116 'drag_drop_types_gtk.cc',
117 'drag_drop_types_win.cc', 117 'drag_drop_types_win.cc',
118 'drag_drop_types.h', 118 'drag_drop_types.h',
119 'event_synthesis_gtk.cc',
120 'event_synthesis_gtk.h',
119 'file_download_interface.h', 121 'file_download_interface.h',
120 'gfx/font_util.h', 122 'gfx/font_util.h',
121 'gfx/font_util.cc', 123 'gfx/font_util.cc',
122 'gfx/gl/gl_bindings.h', 124 'gfx/gl/gl_bindings.h',
123 'gfx/gl/gl_context.cc', 125 'gfx/gl/gl_context.cc',
124 'gfx/gl/gl_context.h', 126 'gfx/gl/gl_context.h',
125 'gfx/gl/gl_context_linux.cc', 127 'gfx/gl/gl_context_linux.cc',
126 'gfx/gl/gl_context_mac.cc', 128 'gfx/gl/gl_context_mac.cc',
127 'gfx/gl/gl_context_osmesa.cc', 129 'gfx/gl/gl_context_osmesa.cc',
128 'gfx/gl/gl_context_osmesa.h', 130 'gfx/gl/gl_context_osmesa.h',
129 'gfx/gl/gl_context_stub.h', 131 'gfx/gl/gl_context_stub.h',
130 'gfx/gl/gl_context_win.cc', 132 'gfx/gl/gl_context_win.cc',
131 'gfx/gl/gl_headers.h', 133 'gfx/gl/gl_headers.h',
132 'gfx/gl/gl_implementation.cc', 134 'gfx/gl/gl_implementation.cc',
133 'gfx/gl/gl_implementation.h', 135 'gfx/gl/gl_implementation.h',
134 'gfx/gl/gl_implementation_linux.cc', 136 'gfx/gl/gl_implementation_linux.cc',
135 'gfx/gl/gl_implementation_mac.cc', 137 'gfx/gl/gl_implementation_mac.cc',
136 'gfx/gl/gl_implementation_win.cc', 138 'gfx/gl/gl_implementation_win.cc',
137 'gfx/gl/gl_interface.h', 139 'gfx/gl/gl_interface.h',
138 'gfx/gl/gl_interface.cc', 140 'gfx/gl/gl_interface.cc',
139 'gfx/gl/gl_mock.h', 141 'gfx/gl/gl_mock.h',
140 'gtk_dnd_util.cc', 142 'gtk_dnd_util.cc',
141 'gtk_dnd_util.h', 143 'gtk_dnd_util.h',
142 'gtk_signal.h', 144 'gtk_signal.h',
143 'gtk_signal_registrar.cc', 145 'gtk_signal_registrar.cc',
144 'gtk_signal_registrar.h', 146 'gtk_signal_registrar.h',
145 'gtk_util.cc', 147 'gtk_util.cc',
146 'gtk_util.h', 148 'gtk_util.h',
149 'keyboard_code_conversion.cc',
150 'keyboard_code_conversion.h',
151 'keyboard_code_conversion_gtk.cc',
152 'keyboard_code_conversion_gtk.h',
153 'keyboard_code_conversion_mac.mm',
154 'keyboard_code_conversion_mac.h',
155 'keyboard_codes.h',
156 'keyboard_codes_win.h',
157 'keyboard_codes_posix.h',
147 'l10n_util.cc', 158 'l10n_util.cc',
148 'l10n_util.h', 159 'l10n_util.h',
149 'l10n_util_mac.h', 160 'l10n_util_mac.h',
150 'l10n_util_mac.mm', 161 'l10n_util_mac.mm',
151 'l10n_util_posix.cc', 162 'l10n_util_posix.cc',
152 'l10n_util_win.cc', 163 'l10n_util_win.cc',
153 'l10n_util_win.h', 164 'l10n_util_win.h',
154 'linear_animation.cc', 165 'linear_animation.cc',
155 'linear_animation.h', 166 'linear_animation.h',
156 'menus/accelerator.h', 167 'menus/accelerator.h',
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 }], 309 }],
299 ['OS=="linux"', { 310 ['OS=="linux"', {
300 'sources': [ 311 'sources': [
301 'gfx/gl/gl_context_egl.cc', 312 'gfx/gl/gl_context_egl.cc',
302 'gfx/gl/gl_context_egl.h', 313 'gfx/gl/gl_context_egl.h',
303 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', 314 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
304 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', 315 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
305 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', 316 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc',
306 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', 317 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h',
307 ], 318 ],
319 'sources!': [
320 'keyboard_code_conversion_mac.mm',
321 'keyboard_code_conversion_mac.h',
322 'keyboard_codes_win.h',
323 ],
308 'include_dirs': [ 324 'include_dirs': [
309 # We don't use angle, but pull the EGL/GLES headers from there. 325 # We don't use angle, but pull the EGL/GLES headers from there.
310 '../third_party/angle/include', 326 '../third_party/angle/include',
311 ], 327 ],
312 'all_dependent_settings': { 328 'all_dependent_settings': {
313 'defines': [ 329 'defines': [
314 'GL_GLEXT_PROTOTYPES', 330 'GL_GLEXT_PROTOTYPES',
315 ], 331 ],
316 'ldflags': [ 332 'ldflags': [
317 '-L<(PRODUCT_DIR)', 333 '-L<(PRODUCT_DIR)',
318 ], 334 ],
319 'link_settings': { 335 'link_settings': {
320 'libraries': [ 336 'libraries': [
321 '-lX11', 337 '-lX11',
322 '-ldl', 338 '-ldl',
323 ], 339 ],
324 }, 340 },
325 }, 341 },
326 }], 342 }],
327 ['OS=="mac"', { 343 ['OS=="mac"', {
328 'link_settings': { 344 'link_settings': {
329 'libraries': [ 345 'libraries': [
330 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 346 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
331 ], 347 ],
332 }, 348 },
349 'sources!': [
350 'event_synthesis_gtk.cc',
351 'event_synthesis_gtk.h',
352 'keyboard_code_conversion_gtk.cc',
353 'keyboard_code_conversion_gtk.h',
354 'keyboard_codes_win.h',
355 ],
333 }], 356 }],
334 ['OS=="win"', { 357 ['OS=="win"', {
335 'include_dirs': [ 358 'include_dirs': [
336 '../third_party/angle/include', 359 '../third_party/angle/include',
337 ], 360 ],
338 'sources': [ 361 'sources': [
339 'gfx/gl/gl_context_egl.cc', 362 'gfx/gl/gl_context_egl.cc',
340 'gfx/gl/gl_context_egl.h', 363 'gfx/gl/gl_context_egl.h',
341 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', 364 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
342 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', 365 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
343 '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', 366 '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc',
344 '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', 367 '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h',
345 ], 368 ],
369 'sources!': [
370 'event_synthesis_gtk.cc',
371 'event_synthesis_gtk.h',
372 'keyboard_code_conversion_gtk.cc',
373 'keyboard_code_conversion_gtk.h',
374 'keyboard_code_conversion_mac.mm',
375 'keyboard_code_conversion_mac.h',
376 'keyboard_codes_posix.h',
377 ],
346 }], 378 }],
347 ], 379 ],
348 }, 380 },
349 ], 381 ],
350 'conditions': [ 382 'conditions': [
351 ['OS=="win"', { 383 ['OS=="win"', {
352 'targets': [ 384 'targets': [
353 { 385 {
354 'target_name': 'app_base_nacl_win64', 386 'target_name': 'app_base_nacl_win64',
355 'type': '<(library)', 387 'type': '<(library)',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 'configurations': { 421 'configurations': {
390 'Common_Base': { 422 'Common_Base': {
391 'msvs_target_platform': 'x64', 423 'msvs_target_platform': 'x64',
392 }, 424 },
393 }, 425 },
394 }, 426 },
395 ], 427 ],
396 }], 428 }],
397 ], 429 ],
398 } 430 }
OLDNEW
« no previous file with comments | « no previous file | app/event_synthesis_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698