diff --git a/CPP/appveyor.cmd b/CPP/appveyor.cmd index 99b96fc1..773a419d 100644 --- a/CPP/appveyor.cmd +++ b/CPP/appveyor.cmd @@ -1,28 +1,38 @@ @echo off 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 2010 (VC=10.0) -> for win2k REM Microsoft Visual Studio 2012 (VC=11.0) REM Microsoft Visual Studio 2013 (VC=12.0) -REM Microsoft Visual Studio 2015 (VC=14.0) -> for: x32 + x64 -REM Microsoft Visual Studio 2017 (VC=15.0) +REM Microsoft Visual Studio 2015 (VC=14.0) +REM Microsoft Visual Studio 2017 (VC=15.0) -> for: x32 + x64 REM to many vcvarsall.cmd calls will blow it up! set OPATH=%PATH% set ERRFILE=%APPVEYOR_BUILD_FOLDER%\error.txt cd %APPVEYOR_BUILD_FOLDER%\CPP -REM I am using VC 14.0 for releases now... /TR 2018-11-15 -goto vc14 +REM releases now: +REM sdk71: ia builds +REM vc10: win2k builds +REM vc14: >= winxp builds +REM /TR 2019-09-07 +goto sdk71 :sdk71 set VC=sdk71 -set NEXT=vc14 +set NEXT=vc10 goto build_sdk +:vc10 +set VC=10.0 +set NEXT=vc14 +set CFLAGS= +goto build_xp + :vc11 set VC=11.0 -set NEXT=vc12 +set NEXT=end set CFLAGS=-Gw goto build_vc @@ -39,6 +49,28 @@ set CFLAGS=-Gw goto build_vc +:build_sdk +set PATH=%OPATH% +call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 +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 +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% @@ -55,14 +87,6 @@ set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-arm call build-arm.cmd goto %NEXT% -:build_sdk -set PATH=%OPATH% -call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 -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 -goto %NEXT% - :end cd %APPVEYOR_BUILD_FOLDER% set > env.txt diff --git a/CPP/build-x32.cmd b/CPP/build-x32.cmd index 22d52867..022829cd 100644 --- a/CPP/build-x32.cmd +++ b/CPP/build-x32.cmd @@ -3,10 +3,11 @@ set ROOT=%cd%\7zip if not defined OUTDIR set OUTDIR=%ROOT%\bin32 if not defined ERRFILE set ERRFILE=%cd%\error.txt +if not defined SUBSYS set SUBSYS="5.01" mkdir %OUTDIR% set OPTS=MY_STATIC_LINK=1 /NOLOGO -set LFLAGS=/SUBSYSTEM:WINDOWS,"5.01" +set LFLAGS=/SUBSYSTEM:WINDOWS,%SUBSYS% cd %ROOT%\Bundles\Format7zExtract nmake %OPTS% @@ -83,7 +84,7 @@ nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x32 @ Uninstall.exe" >> %ERRFILE% copy o\7zipUninstall.exe %OUTDIR%\Uninstall.exe -set LFLAGS=/SUBSYSTEM:CONSOLE,"5.01" +set LFLAGS=/SUBSYSTEM:CONSOLE,%SUBSYS% cd %ROOT%\UI\Console nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x32 @ 7z.exe" >> %ERRFILE% diff --git a/CPP/build-x64.cmd b/CPP/build-x64.cmd index 1b38a9f7..52f2c88d 100644 --- a/CPP/build-x64.cmd +++ b/CPP/build-x64.cmd @@ -3,10 +3,11 @@ set ROOT=%cd%\7zip if not defined OUTDIR set OUTDIR=%ROOT%\bin64 if not defined ERRFILE set ERRFILE=%cd%\error.txt +if not defined SUBSYS set SUBSYS="5.01" mkdir %OUTDIR% set OPTS=PLATFORM=x64 MY_STATIC_LINK=1 /NOLOGO -set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02" +set LFLAGS=/SUBSYSTEM:WINDOWS,%SUBSYS% cd %ROOT%\Bundles\Format7zExtract nmake %OPTS% @@ -83,7 +84,7 @@ nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> %ERRFILE% copy X64\7zipUninstall.exe %OUTDIR%\Uninstall.exe -set LFLAGS=/SUBSYSTEM:CONSOLE,"5.02" +set LFLAGS=/SUBSYSTEM:CONSOLE,%SUBSYS% cd %ROOT%\UI\Console nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> %ERRFILE%