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

Side by Side Diff: build/common.gypi

Issue 9460048: Use gyp names in MIDL build rules rather than VS macros (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix dlldata name too Created 8 years, 8 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 | 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 2815 matching lines...) Expand 10 before | Expand all | Expand 10 after
2826 # SubSystem values: 2826 # SubSystem values:
2827 # 0 == not set 2827 # 0 == not set
2828 # 1 == /SUBSYSTEM:CONSOLE 2828 # 1 == /SUBSYSTEM:CONSOLE
2829 # 2 == /SUBSYSTEM:WINDOWS 2829 # 2 == /SUBSYSTEM:WINDOWS
2830 # Most of the executables we'll ever create are tests 2830 # Most of the executables we'll ever create are tests
2831 # and utilities with console output. 2831 # and utilities with console output.
2832 'SubSystem': '1', 2832 'SubSystem': '1',
2833 }, 2833 },
2834 'VCMIDLTool': { 2834 'VCMIDLTool': {
2835 'GenerateStublessProxies': 'true', 2835 'GenerateStublessProxies': 'true',
2836 'TypeLibraryName': '$(InputName).tlb', 2836 'TypeLibraryName': '<(RULE_INPUT_NAME).tlb',
2837 'OutputDirectory': '$(IntDir)', 2837 'OutputDirectory': '<(INTERMEDIATE_DIR)',
2838 'HeaderFileName': '$(InputName).h', 2838 'HeaderFileName': '<(RULE_INPUT_NAME).h',
2839 'DLLDataFileName': 'dlldata.c', 2839 'DLLDataFileName': '<(RULE_INPUT_NAME).dlldata.c',
Mark Mentovai 2012/03/30 12:54:27 This is not equivalent to what you’re replacing. I
2840 'InterfaceIdentifierFileName': '$(InputName)_i.c', 2840 'InterfaceIdentifierFileName': '<(RULE_INPUT_NAME)_i.c',
2841 'ProxyFileName': '$(InputName)_p.c', 2841 'ProxyFileName': '<(RULE_INPUT_NAME)_p.c',
2842 }, 2842 },
2843 'VCResourceCompilerTool': { 2843 'VCResourceCompilerTool': {
2844 'Culture' : '1033', 2844 'Culture' : '1033',
2845 'AdditionalIncludeDirectories': [ 2845 'AdditionalIncludeDirectories': [
2846 '<(DEPTH)', 2846 '<(DEPTH)',
2847 '<(SHARED_INTERMEDIATE_DIR)', 2847 '<(SHARED_INTERMEDIATE_DIR)',
2848 ], 2848 ],
2849 }, 2849 },
2850 }, 2850 },
2851 }, 2851 },
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
2948 # settings in target dicts. SYMROOT is a special case, because many other 2948 # settings in target dicts. SYMROOT is a special case, because many other
2949 # Xcode variables depend on it, including variables such as 2949 # Xcode variables depend on it, including variables such as
2950 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2950 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2951 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2951 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2952 # files to appear (when present) in the UI as actual files and not red 2952 # files to appear (when present) in the UI as actual files and not red
2953 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2953 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2954 # and therefore SYMROOT, needs to be set at the project level. 2954 # and therefore SYMROOT, needs to be set at the project level.
2955 'SYMROOT': '<(DEPTH)/xcodebuild', 2955 'SYMROOT': '<(DEPTH)/xcodebuild',
2956 }, 2956 },
2957 } 2957 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698