Index: chrome_frame/chrome_frame.gyp |
=================================================================== |
--- chrome_frame/chrome_frame.gyp (revision 104087) |
+++ chrome_frame/chrome_frame.gyp (working copy) |
@@ -62,7 +62,7 @@ |
'type': 'none', |
'msvs_settings': { |
'VCMIDLTool': { |
- 'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)', |
+ 'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame', |
}, |
}, |
'sources': [ |
@@ -89,7 +89,7 @@ |
'locales/locales.gyp:*', |
], |
'sources': [ |
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
'chrome_frame_unittest_main.cc', |
'chrome_launcher.cc', |
'chrome_launcher.h', |
@@ -249,7 +249,7 @@ |
'test/win_event_receiver.cc', |
'test/win_event_receiver.h', |
'chrome_launcher_version.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
'test_utils.cc', |
'test_utils.h', |
], |
@@ -324,7 +324,7 @@ |
'../chrome/test/base/chrome_process_util.cc', |
'../chrome/test/base/chrome_process_util.h', |
'../chrome/test/ui/ui_test.cc', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
'test/chrome_frame_test_utils.cc', |
'test/chrome_frame_test_utils.h', |
'test/perf/chrome_frame_perftest.cc', |
@@ -414,7 +414,7 @@ |
'test/net/test_automation_provider.h', |
'test/net/test_automation_resource_message_filter.cc', |
'test/net/test_automation_resource_message_filter.h', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
'test_utils.cc', |
'test_utils.h', |
@@ -485,7 +485,7 @@ |
'test/simulate_input.h', |
'test/win_event_receiver.cc', |
'test/win_event_receiver.h', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
'../base/test/test_file_util_win.cc', |
'../chrome/test/automation/proxy_launcher.cc', |
'../chrome/test/automation/proxy_launcher.h', |
@@ -561,7 +561,7 @@ |
'test/test_with_web_server.h', |
'test/win_event_receiver.cc', |
'test/win_event_receiver.h', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
'chrome_tab.idl', |
'renderer_glue.cc', |
'test_utils.cc', |
@@ -570,8 +570,6 @@ |
'include_dirs': [ |
'<(DEPTH)/third_party/wtl/include', |
'<(DEPTH)/breakpad/src', |
- # To allow including "chrome_tab.h" |
- '<(INTERMEDIATE_DIR)', |
], |
'resource_include_dirs': [ |
'<(INTERMEDIATE_DIR)', |
@@ -675,7 +673,7 @@ |
'chrome_protocol.cc', |
'chrome_protocol.h', |
'chrome_protocol.rgs', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
'com_message_event.cc', |
'com_message_event.h', |
'com_type_info_holder.cc', |
@@ -859,7 +857,7 @@ |
'chrome_frame_reporting.h', |
'chrome_tab.cc', |
'chrome_tab.def', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', |
# FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can |
# figure out something more gyp-ish. |
'resources/tlb_resource.rc', |
@@ -869,8 +867,6 @@ |
'resource.h', |
], |
'include_dirs': [ |
- # For chrome_tab.h |
- '<(SHARED_INTERMEDIATE_DIR)', |
'<(INTERMEDIATE_DIR)/../npchrome_frame', |
grt (UTC plus 2)
2011/10/06 19:55:32
remove this, too; see previous comment
robertshield
2011/10/14 03:20:03
Done and replaced with path to shared intermediate
|
], |
'conditions': [ |