Compiling for IA64 and WinXP does not work, cause FLZMA2 doesn't buil…

…d then :/
mcmilk · Nov 3, 2019 · 5e3efe4 · 5e3efe4
1 parent 424714a
commit 5e3efe4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/CPP/7zip/Compress/Lzma2Encoder.h b/CPP/7zip/Compress/Lzma2Encoder.h
@@ -67,8 +67,8 @@ class CFastEncoder :
     FL2_dictBuffer dict;
     size_t dict_pos;
 
-    //FastLzma2(const FastLzma2&) = delete;
-    //FastLzma2& operator=(const FastLzma2&) = delete;
+    FastLzma2(const FastLzma2&) = delete;
+    FastLzma2& operator=(const FastLzma2&) = delete;
   };
 
   FastLzma2 _encoder;

diff --git a/CPP/appveyor.cmd b/CPP/appveyor.cmd
@@ -17,7 +17,7 @@ REM sdk71: ia builds
 REM vc10: win2k builds
 REM vc14: >= winxp builds
 REM /TR 2019-09-07
-goto sdk71
+goto vc14
 
 :sdk71
 set VC=sdk71
@@ -28,7 +28,7 @@ goto build_sdk
 set VC=10.0
 set NEXT=vc14
 set CFLAGS=
-goto build_xp
+goto build_vc
 
 :vc11
 set VC=11.0
@@ -57,20 +57,6 @@ set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-ia64
 call build-ia64.cmd
 goto %NEXT%
 
-:build_xp
-FOR /R .\ %%d IN (ARM X64 O) DO rd /S /Q %%d 2>NUL
-set SUBSYS="4.00"
-set PATH=%OPATH%
-call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x32-xp
-call build-x32.cmd
-set PATH=%OPATH%
-call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86_amd64
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x64-xp
-call build-x64.cmd
-set SUBSYS=
-goto %NEXT%
-
 :build_vc
 FOR /R .\ %%d IN (ARM X64 O) DO rd /S /Q %%d 2>NUL
 set PATH=%OPATH%
@@ -91,4 +77,3 @@ goto %NEXT%
 cd %APPVEYOR_BUILD_FOLDER%
 set > env.txt
 7z a %APPVEYOR_PROJECT_NAME%-%APPVEYOR_BUILD_VERSION%.7z bin-* *.txt
-
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ You can install it in two ways:
 2. [Brotli] v.1.0.7 is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling, with a compression ratio comparable to the best currently available general-purpose compression methods. It is similar in speed with deflate but offers more dense compression.
    - Levels: 0..11
 
-3. [LZ4] v1.9.1 is lossless compression algorithm, providing compression speed at 400 MB/s per core (0.16 Bytes/cycle). It features an extremely fast decoder, with speed in multiple GB/s per core (0.71 Bytes/cycle). A high compression derivative, called LZ4_HC, is available, trading customizable CPU time for compression ratio.
+3. [LZ4] v1.9.2 is lossless compression algorithm, providing compression speed at 400 MB/s per core (0.16 Bytes/cycle). It features an extremely fast decoder, with speed in multiple GB/s per core (0.71 Bytes/cycle). A high compression derivative, called LZ4_HC, is available, trading customizable CPU time for compression ratio.
    - Levels: 1..12
 
 4. [LZ5] v1.5 is a modification of LZ4 which gives a better ratio at cost of slower compression and decompression.
@@ -278,7 +278,7 @@ You find this project useful, maybe you consider a donation ;-)
   - [Brotli] Version 1.0.7
   - [Fast LZMA2] Version 1.0.1
   - [Lizard] Version 1.0
-  - [LZ4] Version 1.9.1
+  - [LZ4] Version 1.9.2
   - [LZ5] Version 1.5
   - [Zstandard] Version 1.4.3