From 68f3ed1f3c50236e768c9debeb8ee7c5d969b766 Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Tue, 6 Nov 2018 18:23:53 +0100 Subject: [PATCH] Compiling fixes - add /TP on old IA64 compiler (sdk71) - disable C4389 warning for flzma2 --- C/fast-lzma2/mem.h | 3 +++ C/fast-lzma2/util.h | 1 + CPP/appveyor.cmd | 2 ++ CPP/build-ia64.cmd | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/C/fast-lzma2/mem.h b/C/fast-lzma2/mem.h index 47d23001..f54a45ce 100644 --- a/C/fast-lzma2/mem.h +++ b/C/fast-lzma2/mem.h @@ -28,6 +28,9 @@ extern "C" { #if defined(_MSC_VER) /* Visual Studio */ # include /* _byteswap_ulong */ # include /* _byteswap_* */ +# pragma warning(disable : 4389) /* disable: C4389: '==' : signed/unsigned mismatch */ +#endif + #endif #if defined(__GNUC__) # define MEM_STATIC static __inline __attribute__((unused)) diff --git a/C/fast-lzma2/util.h b/C/fast-lzma2/util.h index fe8b6fa4..d5688203 100644 --- a/C/fast-lzma2/util.h +++ b/C/fast-lzma2/util.h @@ -102,6 +102,7 @@ extern "C" { #elif defined(_MSC_VER) # define UTIL_STATIC static __inline # pragma warning(disable : 4996) /* disable: C4996: 'strncpy': This function or variable may be unsafe. */ +# pragma warning(disable : 4389) /* disable: C4389: '==' : signed/unsigned mismatch */ #else # define UTIL_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */ #endif diff --git a/CPP/appveyor.cmd b/CPP/appveyor.cmd index 4e0a015d..14345aca 100644 --- a/CPP/appveyor.cmd +++ b/CPP/appveyor.cmd @@ -1,9 +1,11 @@ @echo off REM Microsoft Windows SDK 7.1 (VC=sdk71) +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 2017 (VC=15.0) REM to many vcvarsall.cmd calls will blow it up! set OPATH=%PATH% diff --git a/CPP/build-ia64.cmd b/CPP/build-ia64.cmd index 4bd741eb..47cb3d29 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 +set OPTS=CPU=IA64 MY_STATIC_LINK=1 /NOLOGO /TP set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02" cd %ROOT%\Bundles\Format7zExtract