From 8474b3b70c0abd023bfa45f3b08f11369c389520 Mon Sep 17 00:00:00 2001
From: Tino Reichardt <milky-7zip@mcmilk.de>
Date: Thu, 15 Nov 2018 22:36:34 +0100
Subject: [PATCH] Add some minor fixes - add README.md for the hash sources -
 do not compile IA64 binaries:   - the flzma2 does not compile cleanly   - /Gw
 is not implemented within sdk 7.1 :/

---
 C/hashes/README.md |  4 ++++
 CPP/appveyor.cmd   | 26 ++++++++++----------------
 CPP/build-ia64.cmd |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 C/hashes/README.md

diff --git a/C/hashes/README.md b/C/hashes/README.md
new file mode 100644
index 00000000..7d85680c
--- /dev/null
+++ b/C/hashes/README.md
@@ -0,0 +1,4 @@
+
+Taken from lib/crypto/* of samba-4.5.8.tar.gz.
+
+/TR 2018-11-15
diff --git a/CPP/appveyor.cmd b/CPP/appveyor.cmd
index 14345aca..7b512fc8 100644
--- a/CPP/appveyor.cmd
+++ b/CPP/appveyor.cmd
@@ -1,10 +1,10 @@
 @echo off
 
-REM Microsoft Windows SDK 7.1    (VC=sdk71)
+REM Microsoft Windows SDK 7.1    (VC=sdk71) -> can compile for IA64, but who needs that?
 REM Microsoft Visual Studio 2010 (VC=10.0)
 REM Microsoft Visual Studio 2012 (VC=11.0)
 REM Microsoft Visual Studio 2013 (VC=12.0)
-REM Microsoft Visual Studio 2015 (VC=14.0)
+REM Microsoft Visual Studio 2015 (VC=14.0)  -> for: x32 + x64
 REM Microsoft Visual Studio 2017 (VC=15.0)
 
 REM to many vcvarsall.cmd calls will blow it up!
@@ -12,33 +12,33 @@ set OPATH=%PATH%
 set ERRFILE=%APPVEYOR_BUILD_FOLDER%\error.txt
 cd %APPVEYOR_BUILD_FOLDER%\CPP
 
-REM I am using sdk71 and 12.0 for releases... /TR
+REM I am using VC 14.0 for releases now... /TR 2018-11-15
+goto vc14
 
 :sdk71
 set VC=sdk71
-set NEXT=vc12
+set NEXT=vc14
 goto build_sdk
 
 :vc11
 set VC=11.0
 set NEXT=vc12
-goto build
+goto build_vc
 
 :vc12
 set VC=12.0
-set CFLAGS=-Gw
 set NEXT=end
-goto build
+goto build_vc
 
 :vc14
 set VC=14.0
 set NEXT=end
-goto build
+goto build_vc
 
 
-:build
-FOR /R .\ %%d IN (AMD64 O) DO rd /S /Q %%d 2>NUL
+:build_vc
 set PATH=%OPATH%
+FOR /R .\ %%d IN (AMD64 O) DO rd /S /Q %%d 2>NUL
 call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86
 set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x32
 call build-x32.cmd
@@ -50,12 +50,6 @@ goto %NEXT%
 :build_sdk
 set PATH=%OPATH%
 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
-REM call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /Release /x86 /xp
-REM set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x32
-REM call build-x32.cmd
-REM call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /Release /x64 /xp
-REM set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x64
-REM call build-x64.cmd
 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /Release /ia64 /xp
 set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-ia64
 call build-ia64.cmd
diff --git a/CPP/build-ia64.cmd b/CPP/build-ia64.cmd
index 09d89c6e..3af0ae75 100644
--- a/CPP/build-ia64.cmd
+++ b/CPP/build-ia64.cmd
@@ -4,7 +4,7 @@ set ROOT=%cd%\7zip
 if not defined OUTDIR set OUTDIR=%ROOT%\binIA64
 mkdir %OUTDIR%
 
-set OPTS=CPU=IA64 MY_STATIC_LINK=1 /NOLOGO /TP
+set OPTS=CPU=IA64 MY_STATIC_LINK=1 /NOLOGO
 set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02"
 
 cd %ROOT%\Bundles\Format7zExtract