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

Side by Side Diff: win8/metro_driver/metro_driver.gyp

Issue 404443003: Remove intsafe_workaround.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 5 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 | « win8/delegate_execute/delegate_execute.cc ('k') | no next file » | 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 'conditions': [ 5 'conditions': [
6 ['OS=="win"', { 6 ['OS=="win"', {
7 'variables': { 7 'variables': {
8 'chromium_code': 1, 8 'chromium_code': 1,
9 }, 9 },
10 'includes': [ 10 'includes': [
11 '../../build/util/version.gypi', 11 '../../build/util/version.gypi',
12 '../../build/win_precompile.gypi', 12 '../../build/win_precompile.gypi',
13 ], 13 ],
14 'target_defaults': { 14 'target_defaults': {
15 # This and the force include below is a workaround for intsafe.h in
16 # VS 2010.
17 'msvs_system_include_dirs': [
18 '<(DEPTH)/build',
19 ],
20 'msvs_settings': { 15 'msvs_settings': {
21 'VCLinkerTool': { 16 'VCLinkerTool': {
22 'AdditionalDependencies': [ 17 'AdditionalDependencies': [
23 'D2D1.lib', 18 'D2D1.lib',
24 'D3D11.lib', 19 'D3D11.lib',
25 'runtimeobject.lib', 20 'runtimeobject.lib',
26 ], 21 ],
27 'DelayLoadDLLs': [ 22 'DelayLoadDLLs': [
28 'API-MS-WIN-CORE-WINRT-ERROR-L1-1-0.DLL', 23 'API-MS-WIN-CORE-WINRT-ERROR-L1-1-0.DLL',
29 'API-MS-WIN-CORE-WINRT-L1-1-0.DLL', 24 'API-MS-WIN-CORE-WINRT-L1-1-0.DLL',
30 'API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL', 25 'API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL',
31 ], 26 ],
32 }, 27 },
33 'VCCLCompilerTool': {
34 'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
35 },
36 }, 28 },
37 }, 29 },
38 'targets': [ 30 'targets': [
39 { 31 {
40 'target_name': 'metro_driver_version_resources', 32 'target_name': 'metro_driver_version_resources',
41 'type': 'none', 33 'type': 'none',
42 'conditions': [ 34 'conditions': [
43 ['branding == "Chrome"', { 35 ['branding == "Chrome"', {
44 'variables': { 36 'variables': {
45 'branding_path': '../../chrome/app/theme/google_chrome/BRANDING ', 37 'branding_path': '../../chrome/app/theme/google_chrome/BRANDING ',
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 'run_all_unittests.cc', 148 'run_all_unittests.cc',
157 'winrt_utils.cc', 149 'winrt_utils.cc',
158 'winrt_utils.h', 150 'winrt_utils.h',
159 'winrt_utils_unittest.cc', 151 'winrt_utils_unittest.cc',
160 ], 152 ],
161 }, 153 },
162 ], 154 ],
163 },], 155 },],
164 ], 156 ],
165 } 157 }
OLDNEW
« no previous file with comments | « win8/delegate_execute/delegate_execute.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698