diff options
| author | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-22 18:21:11 +0000 |
|---|---|---|
| committer | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-22 18:21:11 +0000 |
| commit | 0a00775a41bd90f4f01017362bac3aeadd6c953e (patch) | |
| tree | 26404f7422e9a56f6a955eb14c84d40a14da59ba /net/build | |
| parent | 968e176577ac4fe102ce66987eb97e037f67796f (diff) | |
| download | chromium_src-0a00775a41bd90f4f01017362bac3aeadd6c953e.zip chromium_src-0a00775a41bd90f4f01017362bac3aeadd6c953e.tar.gz chromium_src-0a00775a41bd90f4f01017362bac3aeadd6c953e.tar.bz2 | |
Rollback 2444 and 2443 to get linux and mac prep
Also need to augment sln dependencies
tbr
Review URL: http://codereview.chromium.org/3188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/build')
| -rw-r--r-- | net/build/net.vcproj | 32 | ||||
| -rw-r--r-- | net/build/net_unittests.vcproj | 4 |
2 files changed, 4 insertions, 32 deletions
diff --git a/net/build/net.vcproj b/net/build/net.vcproj index 77b21f1..d4e779b 100644 --- a/net/build/net.vcproj +++ b/net/build/net.vcproj @@ -21,7 +21,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="4" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\sdch\using_sdch.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -78,7 +78,7 @@ <Configuration Name="Release|Win32" ConfigurationType="4" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\sdch\using_sdch.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -167,14 +167,6 @@ <File RelativePath="..\base\bzip2_filter.cc" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - /> - </FileConfiguration> </File> <File RelativePath="..\base\bzip2_filter.h" @@ -365,11 +357,11 @@ > </File> <File - RelativePath="..\base\net_util.h" + RelativePath="..\base\net_util_win.cc" > </File> <File - RelativePath="..\base\net_util_win.cc" + RelativePath="..\base\net_util.h" > </File> <File @@ -413,22 +405,6 @@ > </File> <File - RelativePath="..\base\sdch_filter.cc" - > - </File> - <File - RelativePath="..\base\sdch_filter.h" - > - </File> - <File - RelativePath="..\base\sdch_manager.cc" - > - </File> - <File - RelativePath="..\base\sdch_manager.h" - > - </File> - <File RelativePath="..\base\socket.h" > </File> diff --git a/net/build/net_unittests.vcproj b/net/build/net_unittests.vcproj index 479c34b..9d0cd3c 100644 --- a/net/build/net_unittests.vcproj +++ b/net/build/net_unittests.vcproj @@ -343,10 +343,6 @@ > </File> <File - RelativePath="..\base\sdch_filter_unitest.cc" - > - </File> - <File RelativePath="..\base\ssl_client_socket_unittest.cc" > </File> |