Skip to content

Commit 69fc4bf

Browse files
committed
Move SUBSYS variable to appveyor.cmd
1 parent d78400f commit 69fc4bf

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

CPP/appveyor.cmd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ goto build_vc
5151

5252
:build_sdk
5353
set PATH=%OPATH%
54+
set SUBSYS="5.01"
5455
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
5556
call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /Release /ia64 /xp
5657
set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-ia64
@@ -60,14 +61,17 @@ goto %NEXT%
6061
:build_vc
6162
FOR /R .\ %%d IN (ARM X64 O) DO rd /S /Q %%d 2>NUL
6263
set PATH=%OPATH%
64+
set SUBSYS="5.01"
6365
call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86
6466
set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x32
6567
call build-x32.cmd
6668
set PATH=%OPATH%
69+
set SUBSYS="5.02"
6770
call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86_amd64
6871
set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x64
6972
call build-x64.cmd
7073
set PATH=%OPATH%
74+
set SUBSYS="6.02"
7175
call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86_arm
7276
set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-arm
7377
call build-arm.cmd

CPP/build-arm.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@echo off
22

33
set ROOT=%cd%\7zip
4-
if not defined OUTDIR set OUTDIR=%ROOT%\binArm
4+
if not defined OUTDIR set OUTDIR=%ROOT%\binArm
55
if not defined ERRFILE set ERRFILE=%cd%\error.txt
66
mkdir %OUTDIR%
77

CPP/build-x32.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
@echo off
22

33
set ROOT=%cd%\7zip
4-
if not defined OUTDIR set OUTDIR=%ROOT%\bin32
4+
if not defined OUTDIR set OUTDIR=%ROOT%\bin32
55
if not defined ERRFILE set ERRFILE=%cd%\error.txt
6-
if not defined SUBSYS set SUBSYS="5.01"
76
mkdir %OUTDIR%
87

98
set OPTS=MY_STATIC_LINK=1 /NOLOGO

CPP/build-x64.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
@echo off
22

33
set ROOT=%cd%\7zip
4-
if not defined OUTDIR set OUTDIR=%ROOT%\bin64
4+
if not defined OUTDIR set OUTDIR=%ROOT%\bin64
55
if not defined ERRFILE set ERRFILE=%cd%\error.txt
6-
if not defined SUBSYS set SUBSYS="5.02"
76
mkdir %OUTDIR%
87

98
set OPTS=PLATFORM=x64 MY_STATIC_LINK=1 /NOLOGO

0 commit comments

Comments
 (0)