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

Side by Side Diff: media/media.gyp

Issue 12300013: Make all media tests build on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/tools/shader_bench/window_win.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 { 1167 {
1168 'target_name': 'demuxer_bench', 1168 'target_name': 'demuxer_bench',
1169 'type': 'executable', 1169 'type': 'executable',
1170 'dependencies': [ 1170 'dependencies': [
1171 'media', 1171 'media',
1172 '../base/base.gyp:base', 1172 '../base/base.gyp:base',
1173 ], 1173 ],
1174 'sources': [ 1174 'sources': [
1175 'tools/demuxer_bench/demuxer_bench.cc', 1175 'tools/demuxer_bench/demuxer_bench.cc',
1176 ], 1176 ],
1177 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1178 'msvs_disabled_warnings': [ 4267, ],
1177 }, 1179 },
1178 ], 1180 ],
1179 }], 1181 }],
1180 ['(OS == "win" or toolkit_uses_gtk == 1) and use_aura != 1', { 1182 ['(OS == "win" or toolkit_uses_gtk == 1) and use_aura != 1', {
1181 'targets': [ 1183 'targets': [
1182 { 1184 {
1183 'target_name': 'shader_bench', 1185 'target_name': 'shader_bench',
1184 'type': 'executable', 1186 'type': 'executable',
1185 'dependencies': [ 1187 'dependencies': [
1186 'media', 1188 'media',
(...skipping 27 matching lines...) Expand all
1214 ['OS=="win"', { 1216 ['OS=="win"', {
1215 'dependencies': [ 1217 'dependencies': [
1216 '../third_party/angle/src/build_angle.gyp:libEGL', 1218 '../third_party/angle/src/build_angle.gyp:libEGL',
1217 '../third_party/angle/src/build_angle.gyp:libGLESv2', 1219 '../third_party/angle/src/build_angle.gyp:libGLESv2',
1218 ], 1220 ],
1219 'sources': [ 1221 'sources': [
1220 'tools/shader_bench/window_win.cc', 1222 'tools/shader_bench/window_win.cc',
1221 ], 1223 ],
1222 }], 1224 }],
1223 ], 1225 ],
1226 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1227 'msvs_disabled_warnings': [ 4267, ],
1224 }, 1228 },
1225 ], 1229 ],
1226 }], 1230 }],
1227 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 1231 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
1228 'targets': [ 1232 'targets': [
1229 { 1233 {
1230 'target_name': 'player_x11', 1234 'target_name': 'player_x11',
1231 'type': 'executable', 1235 'type': 'executable',
1232 'dependencies': [ 1236 'dependencies': [
1233 'media', 1237 'media',
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1435 'target_name': 'ffmpeg_tests', 1439 'target_name': 'ffmpeg_tests',
1436 'type': 'executable', 1440 'type': 'executable',
1437 'dependencies': [ 1441 'dependencies': [
1438 '../base/base.gyp:base', 1442 '../base/base.gyp:base',
1439 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1443 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1440 'media', 1444 'media',
1441 ], 1445 ],
1442 'sources': [ 1446 'sources': [
1443 'test/ffmpeg_tests/ffmpeg_tests.cc', 1447 'test/ffmpeg_tests/ffmpeg_tests.cc',
1444 ], 1448 ],
1449 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1450 'msvs_disabled_warnings': [ 4267, ],
1445 }, 1451 },
1446 { 1452 {
1447 'target_name': 'media_bench', 1453 'target_name': 'media_bench',
1448 'type': 'executable', 1454 'type': 'executable',
1449 'dependencies': [ 1455 'dependencies': [
1450 '../base/base.gyp:base', 1456 '../base/base.gyp:base',
1451 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1457 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1452 'media', 1458 'media',
1453 ], 1459 ],
1454 'sources': [ 1460 'sources': [
1455 'tools/media_bench/media_bench.cc', 1461 'tools/media_bench/media_bench.cc',
1456 ], 1462 ],
1463 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1464 'msvs_disabled_warnings': [ 4267, ],
1457 }, 1465 },
1458 ], 1466 ],
1459 }], 1467 }],
1460 [ 'screen_capture_supported==1 and (target_arch=="ia32" or target_arch=="x64 ")', { 1468 [ 'screen_capture_supported==1 and (target_arch=="ia32" or target_arch=="x64 ")', {
1461 'targets': [ 1469 'targets': [
1462 { 1470 {
1463 'target_name': 'differ_block_sse2', 1471 'target_name': 'differ_block_sse2',
1464 'type': 'static_library', 1472 'type': 'static_library',
1465 'conditions': [ 1473 'conditions': [
1466 [ 'os_posix == 1 and OS != "mac"', { 1474 [ 'os_posix == 1 and OS != "mac"', {
1467 'cflags': [ 1475 'cflags': [
1468 '-msse2', 1476 '-msse2',
1469 ], 1477 ],
1470 }], 1478 }],
1471 ], 1479 ],
1472 'include_dirs': [ 1480 'include_dirs': [
1473 '..', 1481 '..',
1474 ], 1482 ],
1475 'sources': [ 1483 'sources': [
1476 'video/capture/screen/differ_block_sse2.cc', 1484 'video/capture/screen/differ_block_sse2.cc',
1477 'video/capture/screen/differ_block_sse2.h', 1485 'video/capture/screen/differ_block_sse2.h',
1478 ], 1486 ],
1479 }, # end of target differ_block_sse2 1487 }, # end of target differ_block_sse2
1480 ], 1488 ],
1481 }], 1489 }],
1482 ], 1490 ],
1483 } 1491 }
OLDNEW
« no previous file with comments | « no previous file | media/tools/shader_bench/window_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698