@@ -132,6 +132,16 @@ environment:
132132 CMAKE_ARGS : ' -DPDC_UTF8=ON'
133133 ARCHIVE_BASENAME : UTF8_X86
134134
135+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2013'
136+ ARCHITECTURE : amd64_x86
137+ CMAKE_ARGS : ' -DPDC_WIDE=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON'
138+ ARCHIVE_BASENAME : WIDE_x86
139+
140+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2013'
141+ ARCHITECTURE : amd64_x86
142+ CMAKE_ARGS : ' -DPDC_UTF8=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON'
143+ ARCHIVE_BASENAME : UTF8_x86
144+
135145 - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2015'
136146 ARCHITECTURE : amd64_x86
137147 CMAKE_ARGS : ' -DPDC_WIDE=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON -DPDC_GL_BUILD=ON'
@@ -162,42 +172,42 @@ environment:
162172 CMAKE_ARGS : ' -DPDC_UTF8=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF -DPDC_GL_BUILD=OFF'
163173 ARCHIVE_BASENAME : UTF8_ARM
164174
165- - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2017 '
175+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2022 '
166176 ARCHITECTURE : amd64_arm
167177 CMAKE_ARGS : ' -DPDC_WIDE=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF -DPDC_GL_BUILD=OFF'
168178 ARCHIVE_BASENAME : WIDE_ARM
169179
170- - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2017 '
180+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2022 '
171181 ARCHITECTURE : amd64_arm
172182 CMAKE_ARGS : ' -DPDC_UTF8=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF -DPDC_GL_BUILD=OFF'
173183 ARCHIVE_BASENAME : UTF8_ARM
174184
175- - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2017 '
185+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2022 '
176186 ARCHITECTURE : amd64_arm64
177187 CMAKE_ARGS : ' -DPDC_WIDE=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF -DPDC_GL_BUILD=OFF'
178188 ARCHIVE_BASENAME : WIDE_ARM64
179189
180- - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2017 '
190+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2022 '
181191 ARCHITECTURE : amd64_arm64
182192 CMAKE_ARGS : ' -DPDC_UTF8=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF -DPDC_GL_BUILD=OFF'
183193 ARCHIVE_BASENAME : UTF8_ARM64
184194
185- - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2017 '
195+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2022 '
186196 ARCHITECTURE : amd64_x86
187197 CMAKE_ARGS : ' -DPDC_WIDE=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON -DPDC_GL_BUILD=ON'
188198 ARCHIVE_BASENAME : WIDE_x86
189199
190- - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2017 '
200+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2022 '
191201 ARCHITECTURE : amd64_x86
192202 CMAKE_ARGS : ' -DPDC_UTF8=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON -DPDC_GL_BUILD=ON'
193203 ARCHIVE_BASENAME : UTF8_x86
194204
195- - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2017 '
205+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2022 '
196206 ARCHITECTURE : amd64
197207 CMAKE_ARGS : ' -DPDC_WIDE=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON -DPDC_GL_BUILD=ON'
198208 ARCHIVE_BASENAME : WIDE_x64
199209
200- - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2017 '
210+ - APPVEYOR_BUILD_WORKER_IMAGE : ' Visual Studio 2022 '
201211 ARCHITECTURE : amd64
202212 CMAKE_ARGS : ' -DPDC_UTF8=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON -DPDC_GL_BUILD=ON'
203213 ARCHIVE_BASENAME : UTF8_x64
@@ -206,14 +216,18 @@ init:
206216 - echo BUILD_NUMBER=%APPVEYOR_BUILD_NUMBER%
207217 # curl defaults --keepalive-time 60 --max-time ?? about 10 minutes --connect-timeout ??
208218 - set CURL_ARGS=--location --fail --show-error --keepalive-time 10 --connect-timeout 10 --max-time 600
209- # Setup TOOLCHAIN for Visual Studio build tools
219+ # Setup TOOLCHAIN for Visual Studio build tools, VS2013 as "ancient" test using VC2008 Express
210220 - if not DEFINED TOOLCHAIN (
211- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" (
221+ if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" (
222+ set "TOOLCHAIN=VS2008"
223+ ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" (
212224 set "TOOLCHAIN=VS2015"
213225 ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" (
214226 set "TOOLCHAIN=VS2017"
215227 ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2019" (
216228 set "TOOLCHAIN=VS2019"
229+ ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2022" (
230+ set "TOOLCHAIN=VS2022"
217231 )
218232 )
219233 # Setup TOOLCHAIN group variable as CMake Generator
@@ -235,12 +249,12 @@ init:
235249 set "ARTIFACT_NAME=open-watcom-2_0-c-win-x64.exe" &&
236250 set "ARTIFACT_URL=https://github.com/open-watcom/open-watcom-v2/releases/download/Current-build" &&
237251 set "PATH=%WATCOM%\BINNT64;%WATCOM%\BINW;%PATH%"
252+ ) else if "%TOOLCHAIN%"=="VS2013" (
253+ set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
238254 ) else if "%TOOLCHAIN%"=="VS2015" (
239255 set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
240- ) else if "%TOOLCHAIN%"=="VS2017" (
241- set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"
242- ) else if "%TOOLCHAIN%"=="VS2019" (
243- set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
256+ ) else if "%TOOLCHAIN:~0,4%"=="VS20" (
257+ set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio\%TOOLCHAIN:~2,4%\Community\VC\Auxiliary\Build\vcvarsall.bat"
244258 )
245259 # Setup Archive name
246260 - set "ARCHIVE=%TOOLCHAIN%_%CONFIGURATION%_%ARCHIVE_BASENAME%_%APPVEYOR_BUILD_NUMBER%"
0 commit comments