diff options
| -rw-r--r-- | DEPS | 3 | ||||
| -rw-r--r-- | net/base/sdch_filter.cc | 2 | ||||
| -rw-r--r-- | sdch/SConscript | 2 | ||||
| -rw-r--r-- | sdch/sdch.vcproj | 64 | ||||
| -rw-r--r-- | sdch/using_sdch.vsprops | 2 |
5 files changed, 38 insertions, 35 deletions
@@ -5,6 +5,9 @@ deps = { "src/googleurl": "http://google-url.googlecode.com/svn/trunk@93", + "src/sdch/open-vcdiff": + "http://open-vcdiff.googlecode.com/svn/trunk@18", + "src/testing/gtest": "http://googletest.googlecode.com/svn/trunk@63", diff --git a/net/base/sdch_filter.cc b/net/base/sdch_filter.cc index 5fdb765..158c4bb 100644 --- a/net/base/sdch_filter.cc +++ b/net/base/sdch_filter.cc @@ -10,7 +10,7 @@ #include "net/base/sdch_filter.h" #include "net/base/sdch_manager.h" -#include "sdch/open_vcdiff/depot/opensource/open-vcdiff/src/google/vcdecoder.h" +#include "sdch/open-vcdiff/src/google/vcdecoder.h" SdchFilter::SdchFilter() : decoding_status_(DECODING_UNINITIALIZED), diff --git a/sdch/SConscript b/sdch/SConscript index 08e756a..c6c57fb 100644 --- a/sdch/SConscript +++ b/sdch/SConscript @@ -4,7 +4,7 @@ Import('env') -env = env.Clone(OPEN_VCDIFF_DIR='open_vcdiff/depot/opensource/open-vcdiff') +env = env.Clone(OPEN_VCDIFF_DIR='open-vcdiff') env.Prepend( CPPPATH = [ diff --git a/sdch/sdch.vcproj b/sdch/sdch.vcproj index 0b37725..91a9564 100644 --- a/sdch/sdch.vcproj +++ b/sdch/sdch.vcproj @@ -36,7 +36,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./open_vcdiff/depot/opensource/open-vcdiff/vsprojects;" + AdditionalIncludeDirectories="./open-vcdiff/vsprojects;" DefaultCharIsUnsigned="true" /> <Tool @@ -89,7 +89,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="./open_vcdiff/depot/opensource/open-vcdiff/vsprojects;" + AdditionalIncludeDirectories="./open-vcdiff/vsprojects;" DefaultCharIsUnsigned="true" /> <Tool @@ -130,79 +130,79 @@ UniqueIdentifier="{5612E1F3-EC29-4848-8301-B23786CED3CA}" > <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\blockhash.h" + RelativePath=".\open-vcdiff\src\blockhash.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\checksum.h" + RelativePath=".\open-vcdiff\src\checksum.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\codetable.h" + RelativePath=".\open-vcdiff\src\codetable.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\compile_assert.h" + RelativePath=".\open-vcdiff\src\compile_assert.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\vsprojects\config.h" + RelativePath=".\open-vcdiff\vsprojects\config.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\decodetable.h" + RelativePath=".\open-vcdiff\src\decodetable.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\encodetable.h" + RelativePath=".\open-vcdiff\src\encodetable.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\headerparser.h" + RelativePath=".\open-vcdiff\src\headerparser.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\logging.h" + RelativePath=".\open-vcdiff\src\logging.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\google\output_string.h" + RelativePath=".\open-vcdiff\src\google\output_string.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\rolling_hash.h" + RelativePath=".\open-vcdiff\src\rolling_hash.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\vsprojects\stdint.h" + RelativePath=".\open-vcdiff\vsprojects\stdint.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\testing.h" + RelativePath=".\open-vcdiff\src\testing.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\varint_bigendian.h" + RelativePath=".\open-vcdiff\src\varint_bigendian.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\google\vcdecoder.h" + RelativePath=".\open-vcdiff\src\google\vcdecoder.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\vcdiff_defs.h" + RelativePath=".\open-vcdiff\src\vcdiff_defs.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\vcdiffengine.h" + RelativePath=".\open-vcdiff\src\vcdiffengine.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\zconf.h" + RelativePath=".\open-vcdiff\src\zconf.h" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\zlib.h" + RelativePath=".\open-vcdiff\src\zlib.h" > </File> </Filter> @@ -212,47 +212,47 @@ UniqueIdentifier="{883D491D-EF73-4c2f-BB09-6F87DC95DC28}" > <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\addrcache.cc" + RelativePath=".\open-vcdiff\src\addrcache.cc" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\adler32.c" + RelativePath=".\open-vcdiff\src\adler32.c" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\blockhash.cc" + RelativePath=".\open-vcdiff\src\blockhash.cc" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\codetable.cc" + RelativePath=".\open-vcdiff\src\codetable.cc" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\decodetable.cc" + RelativePath=".\open-vcdiff\src\decodetable.cc" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\encodetable.cc" + RelativePath=".\open-vcdiff\src\encodetable.cc" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\headerparser.cc" + RelativePath=".\open-vcdiff\src\headerparser.cc" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\logging.cc" + RelativePath=".\open-vcdiff\src\logging.cc" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\varint_bigendian.cc" + RelativePath=".\open-vcdiff\src\varint_bigendian.cc" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\vcdecoder.cc" + RelativePath=".\open-vcdiff\src\vcdecoder.cc" > </File> <File - RelativePath=".\open_vcdiff\depot\opensource\open-vcdiff\src\vcdiffengine.cc" + RelativePath=".\open-vcdiff\src\vcdiffengine.cc" > </File> </Filter> diff --git a/sdch/using_sdch.vsprops b/sdch/using_sdch.vsprops index 3c25048..fd694e9 100644 --- a/sdch/using_sdch.vsprops +++ b/sdch/using_sdch.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(SolutionDir)..\sdch\open_vcdiff\depot\opensource\open-vcdiff\src;" + AdditionalIncludeDirectories="$(SolutionDir)..\sdch\open-vcdiff\src;" /> </VisualStudioPropertySheet> |