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

Side by Side Diff: chrome_frame/chrome_frame_launcher.gyp

Issue 8317018: Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIATE_DIR, a global... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 8
9 # Keep the archive builder happy. 9 # Keep the archive builder happy.
10 'chrome_personalization%': 1, 10 'chrome_personalization%': 1,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 'targets': [ 61 'targets': [
62 { 62 {
63 'target_name': 'chrome_launcher', 63 'target_name': 'chrome_launcher',
64 'type': 'executable', 64 'type': 'executable',
65 'dependencies': [ 65 'dependencies': [
66 '../breakpad/breakpad.gyp:breakpad_handler', 66 '../breakpad/breakpad.gyp:breakpad_handler',
67 '../chrome/chrome.gyp:chrome_version_header', 67 '../chrome/chrome.gyp:chrome_version_header',
68 '../google_update/google_update.gyp:google_update', 68 '../google_update/google_update.gyp:google_update',
69 'chrome_frame.gyp:chrome_frame_utils', 69 'chrome_frame.gyp:chrome_frame_utils',
70 ], 70 ],
71 'resource_include_dirs': [
72 '<(INTERMEDIATE_DIR)',
73 '<(SHARED_INTERMEDIATE_DIR)',
74 ],
75 'sources': [ 71 'sources': [
76 'chrome_launcher_main.cc', 72 'chrome_launcher_main.cc',
77 'chrome_launcher_version.rc', 73 'chrome_launcher_version.rc',
78 'chrome_launcher.cc', 74 'chrome_launcher.cc',
79 'chrome_launcher.h', 75 'chrome_launcher.h',
80 'update_launcher.cc', 76 'update_launcher.cc',
81 'update_launcher.h' 77 'update_launcher.h'
82 ], 78 ],
83 'msvs_settings': { 79 'msvs_settings': {
84 'VCLinkerTool': { 80 'VCLinkerTool': {
85 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 81 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program.
86 'SubSystem': '2', 82 'SubSystem': '2',
87 'AdditionalDependencies': [ 83 'AdditionalDependencies': [
88 'shlwapi.lib', 84 'shlwapi.lib',
89 ], 85 ],
90 }, 86 },
91 }, 87 },
92 }, 88 },
93 { 89 {
94 'target_name': 'chrome_frame_helper', 90 'target_name': 'chrome_frame_helper',
95 'type': 'executable', 91 'type': 'executable',
96 'dependencies': [ 92 'dependencies': [
97 '../breakpad/breakpad.gyp:breakpad_handler', 93 '../breakpad/breakpad.gyp:breakpad_handler',
98 '../chrome/chrome.gyp:chrome_version_header', 94 '../chrome/chrome.gyp:chrome_version_header',
99 'chrome_frame.gyp:chrome_frame_utils', 95 'chrome_frame.gyp:chrome_frame_utils',
100 'chrome_frame_helper_dll', 96 'chrome_frame_helper_dll',
101 'chrome_frame_helper_lib', 97 'chrome_frame_helper_lib',
102 ], 98 ],
103 'resource_include_dirs': [
104 '<(INTERMEDIATE_DIR)',
105 '<(SHARED_INTERMEDIATE_DIR)',
106 ],
107 'include_dirs': [
108 # To allow including "chrome_tab.h"
109 '<(INTERMEDIATE_DIR)',
110 '<(INTERMEDIATE_DIR)/../chrome_frame',
111 ],
112 'sources': [ 99 'sources': [
113 'chrome_frame_helper_main.cc', 100 'chrome_frame_helper_main.cc',
114 'chrome_frame_helper_version.rc', 101 'chrome_frame_helper_version.rc',
115 ], 102 ],
116 'msvs_settings': { 103 'msvs_settings': {
117 'VCLinkerTool': { 104 'VCLinkerTool': {
118 'OutputFile': 105 'OutputFile':
119 '$(OutDir)\\$(ProjectName).exe', 106 '$(OutDir)\\$(ProjectName).exe',
120 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 107 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program.
121 'SubSystem': '2', 108 'SubSystem': '2',
122 }, 109 },
123 }, 110 },
124 }, 111 },
125 { 112 {
126 'target_name': 'chrome_frame_helper_dll', 113 'target_name': 'chrome_frame_helper_dll',
127 'type': 'shared_library', 114 'type': 'shared_library',
128 'dependencies': [ 115 'dependencies': [
129 '../chrome/chrome.gyp:chrome_version_header', 116 '../chrome/chrome.gyp:chrome_version_header',
117 'chrome_frame.gyp:chrome_tab_idl',
130 'chrome_frame_helper_lib', 118 'chrome_frame_helper_lib',
131 ], 119 ],
132 'resource_include_dirs': [
133 '<(INTERMEDIATE_DIR)',
134 '<(SHARED_INTERMEDIATE_DIR)',
135 ],
136 'include_dirs': [
137 # To allow including "chrome_tab.h"
138 '<(INTERMEDIATE_DIR)',
139 '<(INTERMEDIATE_DIR)/../chrome_frame',
140 ],
141 'sources': [ 120 'sources': [
142 'bho_loader.cc', 121 'bho_loader.cc',
143 'bho_loader.h', 122 'bho_loader.h',
144 'chrome_frame_helper_dll.cc', 123 'chrome_frame_helper_dll.cc',
145 'chrome_frame_helper_dll.def', 124 'chrome_frame_helper_dll.def',
146 'chrome_frame_helper_version.rc', 125 'chrome_frame_helper_version.rc',
147 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 126 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
148 'chrome_tab.idl',
149 'event_hooker.cc', 127 'event_hooker.cc',
150 'event_hooker.h', 128 'event_hooker.h',
151 'iids.cc', 129 'iids.cc',
152 ], 130 ],
153 'msvs_settings': { 131 'msvs_settings': {
154 'VCLinkerTool': { 132 'VCLinkerTool': {
155 'OutputFile': '$(OutDir)\\chrome_frame_helper.dll', 133 'OutputFile': '$(OutDir)\\chrome_frame_helper.dll',
156 'ProgramDatabaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb', 134 'ProgramDatabaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb',
157 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 135 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program.
158 'SubSystem': '2', 136 'SubSystem': '2',
159 }, 137 },
160 }, 138 },
161 }, 139 },
162 { 140 {
163 'target_name': 'chrome_frame_helper_lib', 141 'target_name': 'chrome_frame_helper_lib',
164 'type': 'static_library', 142 'type': 'static_library',
165 'dependencies': [ 143 'dependencies': [
166 '../chrome/chrome.gyp:chrome_version_header', 144 '../chrome/chrome.gyp:chrome_version_header',
167 ], 145 'chrome_frame.gyp:chrome_tab_idl',
168 'resource_include_dirs': [
169 '<(INTERMEDIATE_DIR)',
170 '<(SHARED_INTERMEDIATE_DIR)',
171 ],
172 'include_dirs': [
173 # To allow including "chrome_tab.h"
174 '<(INTERMEDIATE_DIR)',
175 '<(INTERMEDIATE_DIR)/../chrome_frame',
176 ], 146 ],
177 'sources': [ 147 'sources': [
178 'chrome_frame_helper_util.cc', 148 'chrome_frame_helper_util.cc',
179 'chrome_frame_helper_util.h', 149 'chrome_frame_helper_util.h',
180 'registry_watcher.cc', 150 'registry_watcher.cc',
181 'registry_watcher.h', 151 'registry_watcher.h',
182 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 152 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
183 'chrome_tab.idl',
184 'iids.cc', 153 'iids.cc',
185 ], 154 ],
186 'msvs_settings': { 155 'msvs_settings': {
187 'VCLinkerTool': { 156 'VCLinkerTool': {
188 'AdditionalDependencies': [ 157 'AdditionalDependencies': [
189 'shlwapi.lib', 158 'shlwapi.lib',
190 ], 159 ],
191 }, 160 },
192 }, 161 },
193 }, 162 },
194 ], 163 ],
195 } 164 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698