Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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': [ | 71 'resource_include_dirs': [ |
| 72 '<(INTERMEDIATE_DIR)', | 72 '<(INTERMEDIATE_DIR)', |
| 73 '<(SHARED_INTERMEDIATE_DIR)', | 73 '<(SHARED_INTERMEDIATE_DIR)', |
|
grt (UTC plus 2)
2011/10/18 15:56:24
i think this is here for version.h. could you add
robertshield
2011/10/18 17:31:10
Done.
| |
| 74 ], | 74 ], |
| 75 'sources': [ | 75 'sources': [ |
| 76 'chrome_launcher_main.cc', | 76 'chrome_launcher_main.cc', |
| 77 'chrome_launcher_version.rc', | 77 'chrome_launcher_version.rc', |
| 78 'chrome_launcher.cc', | 78 'chrome_launcher.cc', |
| 79 'chrome_launcher.h', | 79 'chrome_launcher.h', |
| 80 'update_launcher.cc', | 80 'update_launcher.cc', |
| 81 'update_launcher.h' | 81 'update_launcher.h' |
| 82 ], | 82 ], |
| 83 'msvs_settings': { | 83 'msvs_settings': { |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 95 'type': 'executable', | 95 'type': 'executable', |
| 96 'dependencies': [ | 96 'dependencies': [ |
| 97 '../breakpad/breakpad.gyp:breakpad_handler', | 97 '../breakpad/breakpad.gyp:breakpad_handler', |
| 98 '../chrome/chrome.gyp:chrome_version_header', | 98 '../chrome/chrome.gyp:chrome_version_header', |
| 99 'chrome_frame.gyp:chrome_frame_utils', | 99 'chrome_frame.gyp:chrome_frame_utils', |
| 100 'chrome_frame_helper_dll', | 100 'chrome_frame_helper_dll', |
| 101 'chrome_frame_helper_lib', | 101 'chrome_frame_helper_lib', |
| 102 ], | 102 ], |
| 103 'resource_include_dirs': [ | 103 'resource_include_dirs': [ |
| 104 '<(INTERMEDIATE_DIR)', | 104 '<(INTERMEDIATE_DIR)', |
| 105 '<(SHARED_INTERMEDIATE_DIR)', | 105 '<(SHARED_INTERMEDIATE_DIR)', |
|
grt (UTC plus 2)
2011/10/18 15:56:24
same comment: i think these are all here because o
robertshield
2011/10/18 17:31:10
Yes, but as discussed that is not in the scope of
| |
| 106 ], | 106 ], |
| 107 'include_dirs': [ | |
| 108 # To allow including "chrome_tab.h" | |
| 109 '<(INTERMEDIATE_DIR)', | |
| 110 '<(INTERMEDIATE_DIR)/../chrome_frame', | |
| 111 ], | |
| 112 'sources': [ | 107 'sources': [ |
| 113 'chrome_frame_helper_main.cc', | 108 'chrome_frame_helper_main.cc', |
| 114 'chrome_frame_helper_version.rc', | 109 'chrome_frame_helper_version.rc', |
| 115 ], | 110 ], |
| 116 'msvs_settings': { | 111 'msvs_settings': { |
| 117 'VCLinkerTool': { | 112 'VCLinkerTool': { |
| 118 'OutputFile': | 113 'OutputFile': |
| 119 '$(OutDir)\\$(ProjectName).exe', | 114 '$(OutDir)\\$(ProjectName).exe', |
| 120 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. | 115 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. |
| 121 'SubSystem': '2', | 116 'SubSystem': '2', |
| 122 }, | 117 }, |
| 123 }, | 118 }, |
| 124 }, | 119 }, |
| 125 { | 120 { |
| 126 'target_name': 'chrome_frame_helper_dll', | 121 'target_name': 'chrome_frame_helper_dll', |
| 127 'type': 'shared_library', | 122 'type': 'shared_library', |
| 128 'dependencies': [ | 123 'dependencies': [ |
| 129 '../chrome/chrome.gyp:chrome_version_header', | 124 '../chrome/chrome.gyp:chrome_version_header', |
| 125 'chrome_frame.gyp:chrome_tab_idl', | |
| 130 'chrome_frame_helper_lib', | 126 'chrome_frame_helper_lib', |
| 131 ], | 127 ], |
| 128 'include_dirs': [ | |
|
grt (UTC plus 2)
2011/10/18 15:56:24
this shouldn't be needed since chrome_tab_idl spec
robertshield
2011/10/18 17:31:10
Removed.
| |
| 129 '<(SHARED_INTERMEDIATE_DIR)', | |
| 130 ], | |
| 132 'resource_include_dirs': [ | 131 'resource_include_dirs': [ |
| 133 '<(INTERMEDIATE_DIR)', | 132 '<(INTERMEDIATE_DIR)', |
| 134 '<(SHARED_INTERMEDIATE_DIR)', | 133 '<(SHARED_INTERMEDIATE_DIR)', |
|
grt (UTC plus 2)
2011/10/18 15:56:24
sigh
robertshield
2011/10/18 17:31:10
I can make you a cake. Maybe that will make you fe
| |
| 135 ], | 134 ], |
| 136 'include_dirs': [ | |
| 137 # To allow including "chrome_tab.h" | |
| 138 '<(INTERMEDIATE_DIR)', | |
| 139 '<(INTERMEDIATE_DIR)/../chrome_frame', | |
| 140 ], | |
| 141 'sources': [ | 135 'sources': [ |
| 142 'bho_loader.cc', | 136 'bho_loader.cc', |
| 143 'bho_loader.h', | 137 'bho_loader.h', |
| 144 'chrome_frame_helper_dll.cc', | 138 'chrome_frame_helper_dll.cc', |
| 145 'chrome_frame_helper_dll.def', | 139 'chrome_frame_helper_dll.def', |
| 146 'chrome_frame_helper_version.rc', | 140 'chrome_frame_helper_version.rc', |
| 147 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', | 141 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
| 148 'chrome_tab.idl', | |
| 149 'event_hooker.cc', | 142 'event_hooker.cc', |
| 150 'event_hooker.h', | 143 'event_hooker.h', |
| 151 'iids.cc', | 144 'iids.cc', |
| 152 ], | 145 ], |
| 153 'msvs_settings': { | 146 'msvs_settings': { |
| 154 'VCLinkerTool': { | 147 'VCLinkerTool': { |
| 155 'OutputFile': '$(OutDir)\\chrome_frame_helper.dll', | 148 'OutputFile': '$(OutDir)\\chrome_frame_helper.dll', |
| 156 'ProgramDatabaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb', | 149 'ProgramDatabaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb', |
| 157 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. | 150 # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. |
| 158 'SubSystem': '2', | 151 'SubSystem': '2', |
| 159 }, | 152 }, |
| 160 }, | 153 }, |
| 161 }, | 154 }, |
| 162 { | 155 { |
| 163 'target_name': 'chrome_frame_helper_lib', | 156 'target_name': 'chrome_frame_helper_lib', |
| 164 'type': 'static_library', | 157 'type': 'static_library', |
| 165 'dependencies': [ | 158 'dependencies': [ |
| 166 '../chrome/chrome.gyp:chrome_version_header', | 159 '../chrome/chrome.gyp:chrome_version_header', |
| 160 'chrome_frame.gyp:chrome_tab_idl', | |
| 161 ], | |
| 162 'include_dirs': [ | |
|
grt (UTC plus 2)
2011/10/18 15:56:24
remove for same reason as above
robertshield
2011/10/18 17:31:10
Done.
| |
| 163 '<(SHARED_INTERMEDIATE_DIR)', | |
| 167 ], | 164 ], |
| 168 'resource_include_dirs': [ | 165 'resource_include_dirs': [ |
| 169 '<(INTERMEDIATE_DIR)', | 166 '<(INTERMEDIATE_DIR)', |
| 170 '<(SHARED_INTERMEDIATE_DIR)', | 167 '<(SHARED_INTERMEDIATE_DIR)', |
|
grt (UTC plus 2)
2011/10/18 15:56:24
more sighing
robertshield
2011/10/18 17:31:10
The cake was a lie.
| |
| 171 ], | 168 ], |
| 172 'include_dirs': [ | |
| 173 # To allow including "chrome_tab.h" | |
| 174 '<(INTERMEDIATE_DIR)', | |
| 175 '<(INTERMEDIATE_DIR)/../chrome_frame', | |
| 176 ], | |
| 177 'sources': [ | 169 'sources': [ |
| 178 'chrome_frame_helper_util.cc', | 170 'chrome_frame_helper_util.cc', |
| 179 'chrome_frame_helper_util.h', | 171 'chrome_frame_helper_util.h', |
| 180 'registry_watcher.cc', | 172 'registry_watcher.cc', |
| 181 'registry_watcher.h', | 173 'registry_watcher.h', |
| 182 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', | 174 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
| 183 'chrome_tab.idl', | |
| 184 'iids.cc', | 175 'iids.cc', |
| 185 ], | 176 ], |
| 186 'msvs_settings': { | 177 'msvs_settings': { |
| 187 'VCLinkerTool': { | 178 'VCLinkerTool': { |
| 188 'AdditionalDependencies': [ | 179 'AdditionalDependencies': [ |
| 189 'shlwapi.lib', | 180 'shlwapi.lib', |
| 190 ], | 181 ], |
| 191 }, | 182 }, |
| 192 }, | 183 }, |
| 193 }, | 184 }, |
| 194 ], | 185 ], |
| 195 } | 186 } |
| OLD | NEW |