diff options
| author | Steve Block <steveblock@google.com> | 2011-05-13 06:44:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-13 06:44:40 -0700 |
| commit | 08014c20784f3db5df3a89b73cce46037b77eb59 (patch) | |
| tree | 47749210d31e19e6e2f64036fa8fae2ad693476f /WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops | |
| parent | 860220379e56aeb66424861ad602b07ee22b4055 (diff) | |
| parent | 4c3661f7918f8b3f139f824efb7855bedccb4c94 (diff) | |
| download | external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.zip external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.gz external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.bz2 | |
Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3
* changes:
Merge WebKit at r75315: Update WebKit version
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
Merge WebKit at r75315: Stub out AXObjectCache::remove()
Merge WebKit at r75315: Fix ImageBuffer
Merge WebKit at r75315: Fix PluginData::initPlugins()
Merge WebKit at r75315: Fix conflicts
Merge WebKit at r75315: Fix Makefiles
Merge WebKit at r75315: Move Android-specific WebCore files to Source
Merge WebKit at r75315: Initial merge by git.
Diffstat (limited to 'WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops')
| -rw-r--r-- | WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops b/WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops index 677847d..1621ea6 100644 --- a/WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops +++ b/WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops @@ -3,11 +3,11 @@ ProjectType="Visual C++" Version="8.00" Name="WebKitGUIDCommon" - OutputDirectory="$(WebKitOutputDir)\lib" + OutputDirectory="$(ConfigurationBuildDir)\lib" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(WebKitOutputDir)\$(ConfigurationName)\WebKit" + AdditionalIncludeDirectories="$(ConfigurationBuildDir)\WebKit" PreprocessorDefinitions="_USRDLL;WEBKITGUID_EXPORTS" /> <Tool |