Move SUBSYS variable to appveyor.cmd

mcmilk · Apr 11, 2020 · 69fc4bf · 69fc4bf
1 parent d78400f
commit 69fc4bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CPP/appveyor.cmd b/CPP/appveyor.cmd
@@ -51,6 +51,7 @@ goto build_vc
 
 :build_sdk
 set PATH=%OPATH%
+set SUBSYS="5.01"
 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
@@ -60,14 +61,17 @@ goto %NEXT%
 :build_vc
 FOR /R .\ %%d IN (ARM X64 O) DO rd /S /Q %%d 2>NUL
 set PATH=%OPATH%
+set SUBSYS="5.01"
 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
 set PATH=%OPATH%
+set SUBSYS="5.02"
 call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86_amd64
 set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x64
 call build-x64.cmd
 set PATH=%OPATH%
+set SUBSYS="6.02"
 call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86_arm
 set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-arm
 call build-arm.cmd

diff --git a/CPP/build-arm.cmd b/CPP/build-arm.cmd
@@ -1,7 +1,7 @@
 @echo off
 
 set ROOT=%cd%\7zip
-if not defined OUTDIR set OUTDIR=%ROOT%\binArm
+if not defined OUTDIR  set OUTDIR=%ROOT%\binArm
 if not defined ERRFILE set ERRFILE=%cd%\error.txt
 mkdir %OUTDIR%
 

diff --git a/CPP/build-x32.cmd b/CPP/build-x32.cmd
@@ -1,9 +1,8 @@
 @echo off
 
 set ROOT=%cd%\7zip
-if not defined OUTDIR set OUTDIR=%ROOT%\bin32
+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

diff --git a/CPP/build-x64.cmd b/CPP/build-x64.cmd
@@ -1,9 +1,8 @@
 @echo off
 
 set ROOT=%cd%\7zip
-if not defined OUTDIR set OUTDIR=%ROOT%\bin64
+if not defined OUTDIR  set OUTDIR=%ROOT%\bin64
 if not defined ERRFILE set ERRFILE=%cd%\error.txt
-if not defined SUBSYS set SUBSYS="5.02"
 mkdir %OUTDIR%
 
 set OPTS=PLATFORM=x64 MY_STATIC_LINK=1 /NOLOGO