Skip to content

Commit 6a06310

Browse files
jack9267jack9267
committed
Fix environment trouble with build scripts
1 parent 734ae74 commit 6a06310

16 files changed

+32
-0
lines changed

Diff for: ‎Configure_VS2017.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 15 2017"
34
set CMAKE_GENERATOR_PLATFORM=Win32
45
set CMAKE_GENERATOR_TOOLSET=v141
56
call Configure.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Configure.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎Configure_VS2017_XP.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 15 2017"
34
set CMAKE_GENERATOR_PLATFORM=Win32
45
set CMAKE_GENERATOR_TOOLSET=v141_xp
@@ -7,4 +8,5 @@ call Configure.bat
78
set CMAKE_EXTRA_PATH=_static
89
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON -DNO_ENHANCED_INSTRUCTIONS=ON
910
call Configure.bat
11+
endlocal
1012
if not defined AUTOMATION pause

Diff for: ‎Configure_VS2017_XP_x64.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 15 2017"
34
set CMAKE_GENERATOR_PLATFORM=x64
45
set CMAKE_GENERATOR_TOOLSET=v141_xp
56
call Configure.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Configure.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎Configure_VS2017_x64.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 15 2017"
34
set CMAKE_GENERATOR_PLATFORM=x64
45
set CMAKE_GENERATOR_TOOLSET=v141
56
call Configure.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Configure.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎Configure_VS2019.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 16 2019"
34
set CMAKE_GENERATOR_PLATFORM=Win32
45
set CMAKE_GENERATOR_TOOLSET=v142
56
call Configure.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Configure.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎Configure_VS2019_XP.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 16 2019"
34
set CMAKE_GENERATOR_PLATFORM=Win32
45
set CMAKE_GENERATOR_TOOLSET=v141_xp
@@ -7,4 +8,5 @@ call Configure.bat
78
set CMAKE_EXTRA_PATH=_static
89
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON -DNO_ENHANCED_INSTRUCTIONS=ON
910
call Configure.bat
11+
endlocal
1012
if not defined AUTOMATION pause

Diff for: ‎Configure_VS2019_XP_x64.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 16 2019"
34
set CMAKE_GENERATOR_PLATFORM=x64
45
set CMAKE_GENERATOR_TOOLSET=v141_xp
56
call Configure.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Configure.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎Configure_VS2019_x64.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 16 2019"
34
set CMAKE_GENERATOR_PLATFORM=x64
45
set CMAKE_GENERATOR_TOOLSET=v142
56
call Configure.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Configure.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎VS2017.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 15 2017"
34
set CMAKE_GENERATOR_PLATFORM=Win32
45
set CMAKE_GENERATOR_TOOLSET=v141
56
call Compile.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Compile.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎VS2017_XP.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 15 2017"
34
set CMAKE_GENERATOR_PLATFORM=Win32
45
set CMAKE_GENERATOR_TOOLSET=v141_xp
@@ -7,4 +8,5 @@ call Compile.bat
78
set CMAKE_EXTRA_PATH=_static
89
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON -DNO_ENHANCED_INSTRUCTIONS=ON
910
call Compile.bat
11+
endlocal
1012
if not defined AUTOMATION pause

Diff for: ‎VS2017_XP_x64.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 15 2017"
34
set CMAKE_GENERATOR_PLATFORM=x64
45
set CMAKE_GENERATOR_TOOLSET=v141_xp
56
call Compile.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Compile.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎VS2017_x64.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 15 2017"
34
set CMAKE_GENERATOR_PLATFORM=x64
45
set CMAKE_GENERATOR_TOOLSET=v141
56
call Compile.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Compile.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎VS2019.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 16 2019"
34
set CMAKE_GENERATOR_PLATFORM=Win32
45
set CMAKE_GENERATOR_TOOLSET=v142
56
call Compile.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Compile.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎VS2019_XP.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 16 2019"
34
set CMAKE_GENERATOR_PLATFORM=Win32
45
set CMAKE_GENERATOR_TOOLSET=v141_xp
@@ -7,4 +8,5 @@ call Compile.bat
78
set CMAKE_EXTRA_PATH=_static
89
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON -DNO_ENHANCED_INSTRUCTIONS=ON
910
call Compile.bat
11+
endlocal
1012
if not defined AUTOMATION pause

Diff for: ‎VS2019_XP_x64.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 16 2019"
34
set CMAKE_GENERATOR_PLATFORM=x64
45
set CMAKE_GENERATOR_TOOLSET=v141_xp
56
call Compile.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Compile.bat
10+
endlocal
911
if not defined AUTOMATION pause

Diff for: ‎VS2019_x64.bat

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
@echo off
2+
setlocal
23
set CMAKE_GENERATOR="Visual Studio 16 2019"
34
set CMAKE_GENERATOR_PLATFORM=x64
45
set CMAKE_GENERATOR_TOOLSET=v142
56
call Compile.bat
67
set CMAKE_EXTRA_PATH=_static
78
set CMAKE_EXTRA_ARGS=-DFORCE_STATIC_VCRT=ON
89
call Compile.bat
10+
endlocal
911
if not defined AUTOMATION pause

0 commit comments

Comments
 (0)