Chromium Code Reviews| Index: chrome_frame/chrome_frame_launcher.gyp |
| =================================================================== |
| --- chrome_frame/chrome_frame_launcher.gyp (revision 105823) |
| +++ chrome_frame/chrome_frame_launcher.gyp (working copy) |
| @@ -104,11 +104,6 @@ |
| '<(INTERMEDIATE_DIR)', |
| '<(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
|
| ], |
| - 'include_dirs': [ |
| - # To allow including "chrome_tab.h" |
| - '<(INTERMEDIATE_DIR)', |
| - '<(INTERMEDIATE_DIR)/../chrome_frame', |
| - ], |
| 'sources': [ |
| 'chrome_frame_helper_main.cc', |
| 'chrome_frame_helper_version.rc', |
| @@ -127,25 +122,23 @@ |
| 'type': 'shared_library', |
| 'dependencies': [ |
| '../chrome/chrome.gyp:chrome_version_header', |
| + 'chrome_frame.gyp:chrome_tab_idl', |
| 'chrome_frame_helper_lib', |
| ], |
| + '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.
|
| + '<(SHARED_INTERMEDIATE_DIR)', |
| + ], |
| 'resource_include_dirs': [ |
| '<(INTERMEDIATE_DIR)', |
| '<(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
|
| ], |
| - 'include_dirs': [ |
| - # To allow including "chrome_tab.h" |
| - '<(INTERMEDIATE_DIR)', |
| - '<(INTERMEDIATE_DIR)/../chrome_frame', |
| - ], |
| 'sources': [ |
| 'bho_loader.cc', |
| 'bho_loader.h', |
| 'chrome_frame_helper_dll.cc', |
| 'chrome_frame_helper_dll.def', |
| 'chrome_frame_helper_version.rc', |
| - '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
| - 'chrome_tab.idl', |
| + '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
| 'event_hooker.cc', |
| 'event_hooker.h', |
| 'iids.cc', |
| @@ -164,23 +157,21 @@ |
| 'type': 'static_library', |
| 'dependencies': [ |
| '../chrome/chrome.gyp:chrome_version_header', |
| + 'chrome_frame.gyp:chrome_tab_idl', |
| ], |
| + '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.
|
| + '<(SHARED_INTERMEDIATE_DIR)', |
| + ], |
| 'resource_include_dirs': [ |
| '<(INTERMEDIATE_DIR)', |
| '<(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.
|
| ], |
| - 'include_dirs': [ |
| - # To allow including "chrome_tab.h" |
| - '<(INTERMEDIATE_DIR)', |
| - '<(INTERMEDIATE_DIR)/../chrome_frame', |
| - ], |
| 'sources': [ |
| 'chrome_frame_helper_util.cc', |
| 'chrome_frame_helper_util.h', |
| 'registry_watcher.cc', |
| 'registry_watcher.h', |
| - '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
| - 'chrome_tab.idl', |
| + '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
| 'iids.cc', |
| ], |
| 'msvs_settings': { |