From 894fd5602227ce7db6849a4a4cf0ff4d0ed2246b Mon Sep 17 00:00:00 2001 From: Laura Hermanns Date: Thu, 3 Aug 2023 23:05:47 -0400 Subject: [PATCH] Replaced MSVC16+ builds in AppVeyor CIS script with static library builds of MSVC14 and MSVC15 configurations. --- appveyor.yml | 84 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c516268db6..aa9b08e2a3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,84 +5,100 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 14 2015" ARCH: "Win32" + STATIC_LIB: OFF CONFIG: Debug - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 14 2015" ARCH: "Win32" + STATIC_LIB: ON + CONFIG: Debug + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + GENERATOR: "Visual Studio 14 2015" + ARCH: "Win32" + STATIC_LIB: OFF + CONFIG: Release + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + GENERATOR: "Visual Studio 14 2015" + ARCH: "Win32" + STATIC_LIB: ON CONFIG: Release - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 14 2015" ARCH: "x64" + STATIC_LIB: OFF CONFIG: Debug - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 14 2015" ARCH: "x64" + STATIC_LIB: ON + CONFIG: Debug + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + GENERATOR: "Visual Studio 14 2015" + ARCH: "x64" + STATIC_LIB: OFF + CONFIG: Release + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + GENERATOR: "Visual Studio 14 2015" + ARCH: "x64" + STATIC_LIB: ON CONFIG: Release - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017" ARCH: "Win32" + STATIC_LIB: OFF CONFIG: Debug - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017" ARCH: "Win32" - CONFIG: Release - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - GENERATOR: "Visual Studio 15 2017" - ARCH: "x64" + STATIC_LIB: ON CONFIG: Debug - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017" - ARCH: "x64" - CONFIG: Release - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - GENERATOR: "Visual Studio 16 2019" ARCH: "Win32" - CONFIG: Debug + STATIC_LIB: OFF + CONFIG: Release - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - GENERATOR: "Visual Studio 16 2019" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + GENERATOR: "Visual Studio 15 2017" ARCH: "Win32" + STATIC_LIB: ON CONFIG: Release - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - GENERATOR: "Visual Studio 16 2019" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + GENERATOR: "Visual Studio 15 2017" ARCH: "x64" + STATIC_LIB: OFF CONFIG: Debug - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - GENERATOR: "Visual Studio 16 2019" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + GENERATOR: "Visual Studio 15 2017" ARCH: "x64" - CONFIG: Release - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - GENERATOR: "Visual Studio 17 2022" - ARCH: "Win32" + STATIC_LIB: ON CONFIG: Debug - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - GENERATOR: "Visual Studio 17 2022" - ARCH: "Win32" - CONFIG: Release - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - GENERATOR: "Visual Studio 17 2022" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + GENERATOR: "Visual Studio 15 2017" ARCH: "x64" - CONFIG: Debug - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - GENERATOR: "Visual Studio 17 2022" + STATIC_LIB: OFF + CONFIG: Release + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + GENERATOR: "Visual Studio 15 2017" ARCH: "x64" + STATIC_LIB: ON CONFIG: Release build_script: - git clone https://github.com/LukasBanana/GaussianLib.git - - cmake -G "%GENERATOR%" -A "%ARCH%" -DLLGL_BUILD_EXAMPLES=ON -DLLGL_BUILD_TESTS=ON -DLLGL_BUILD_RENDERER_OPENGL=ON -DLLGL_BUILD_RENDERER_DIRECT3D11=ON -DLLGL_BUILD_RENDERER_DIRECT3D12=ON -DGaussLib_INCLUDE_DIR:STRING="GaussianLib/include" -S . -B builds + - cmake -G "%GENERATOR%" -A "%ARCH%"-DLLGL_BUILD_STATIC_LIB=%STATIC_LIB% -DLLGL_BUILD_EXAMPLES=ON -DLLGL_BUILD_TESTS=ON -DLLGL_BUILD_RENDERER_OPENGL=ON -DLLGL_BUILD_RENDERER_DIRECT3D11=ON -DLLGL_BUILD_RENDERER_DIRECT3D12=ON -DGaussLib_INCLUDE_DIR:STRING="GaussianLib/include" -S . -B builds - cmake --build builds --config "%CONFIG%"