diff options
Diffstat (limited to 'xdelta3')
-rw-r--r-- | xdelta3/xdelta3-lzma.h | 4 | ||||
-rwxr-xr-x | xdelta3/xdelta3.vcxproj | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/xdelta3/xdelta3-lzma.h b/xdelta3/xdelta3-lzma.h index 89c0f1e..5be8407 100644 --- a/xdelta3/xdelta3-lzma.h +++ b/xdelta3/xdelta3-lzma.h | |||
@@ -142,7 +142,7 @@ int xd3_encode_lzma (xd3_stream *stream, | |||
142 | while (1) | 142 | while (1) |
143 | { | 143 | { |
144 | int lret; | 144 | int lret; |
145 | 145 | size_t nwrite; | |
146 | if (sec->lzma.avail_in == 0 && input != NULL) | 146 | if (sec->lzma.avail_in == 0 && input != NULL) |
147 | { | 147 | { |
148 | sec->lzma.avail_in = input->next; | 148 | sec->lzma.avail_in = input->next; |
@@ -156,7 +156,7 @@ int xd3_encode_lzma (xd3_stream *stream, | |||
156 | 156 | ||
157 | lret = lzma_code (&sec->lzma, action); | 157 | lret = lzma_code (&sec->lzma, action); |
158 | 158 | ||
159 | size_t nwrite = (output->avail - output->next) - sec->lzma.avail_out; | 159 | nwrite = (output->avail - output->next) - sec->lzma.avail_out; |
160 | 160 | ||
161 | if (nwrite != 0) | 161 | if (nwrite != 0) |
162 | { | 162 | { |
diff --git a/xdelta3/xdelta3.vcxproj b/xdelta3/xdelta3.vcxproj index a0eed72..9a14358 100755 --- a/xdelta3/xdelta3.vcxproj +++ b/xdelta3/xdelta3.vcxproj | |||
@@ -173,6 +173,8 @@ | |||
173 | </PropertyGroup> | 173 | </PropertyGroup> |
174 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 174 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
175 | <LinkIncremental>false</LinkIncremental> | 175 | <LinkIncremental>false</LinkIncremental> |
176 | <IncludePath>$(WindowsSdkDir)\include;$(VCInstallDir)include;..\xz\include</IncludePath> | ||
177 | <LibraryPath>$(LibraryPath);$(VSInstallDir);$(VSInstallDir)lib\amd64;..\xz\bin_x86-64</LibraryPath> | ||
176 | </PropertyGroup> | 178 | </PropertyGroup> |
177 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Win32'"> | 179 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Win32'"> |
178 | <LinkIncremental>false</LinkIncremental> | 180 | <LinkIncremental>false</LinkIncremental> |
@@ -263,7 +265,7 @@ | |||
263 | <Optimization>MaxSpeed</Optimization> | 265 | <Optimization>MaxSpeed</Optimization> |
264 | <FunctionLevelLinking>true</FunctionLevelLinking> | 266 | <FunctionLevelLinking>true</FunctionLevelLinking> |
265 | <IntrinsicFunctions>true</IntrinsicFunctions> | 267 | <IntrinsicFunctions>true</IntrinsicFunctions> |
266 | <PreprocessorDefinitions>WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 268 | <PreprocessorDefinitions>WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;SECONDARY_LZMA=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
267 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 269 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
268 | </ClCompile> | 270 | </ClCompile> |
269 | <Link> | 271 | <Link> |
@@ -271,6 +273,7 @@ | |||
271 | <GenerateDebugInformation>true</GenerateDebugInformation> | 273 | <GenerateDebugInformation>true</GenerateDebugInformation> |
272 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | 274 | <EnableCOMDATFolding>true</EnableCOMDATFolding> |
273 | <OptimizeReferences>true</OptimizeReferences> | 275 | <OptimizeReferences>true</OptimizeReferences> |
276 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);liblzma.a</AdditionalDependencies> | ||
274 | </Link> | 277 | </Link> |
275 | </ItemDefinitionGroup> | 278 | </ItemDefinitionGroup> |
276 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Win32'"> | 279 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Win32'"> |