From a781c755129c50c638eb0e50bded1eb34a292461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= Date: Wed, 17 Apr 2024 18:06:09 +0200 Subject: [PATCH] Removed the unused SDL1 part from AppVeyor --- .appveyor.yml | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9da6ad1b..b94ca959 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,15 +14,12 @@ environment: SDL1_IDIR: c:\mylibs\include\SDL SDL2_IDIR: c:\mylibs\include\SDL2 LIBDIR: c:\mylibs\lib - matrix: - - SDL_VER: 2 install: - git submodule update --init --recursive - cmake --version - mkdir %ZLIB_IDIR% - - mkdir %SDL1_IDIR% - mkdir %SDL2_IDIR% - mkdir %LIBDIR% - cd %TEMP% @@ -31,22 +28,6 @@ install: - 7z x zlib128-dll.zip > nul - copy include\* %ZLIB_IDIR% > nul - copy lib\* %LIBDIR% > nul - # Download SDL1 - - appveyor DownloadFile https://www.libsdl.org/release/SDL-devel-1.2.15-VC.zip - - appveyor DownloadFile https://www.libsdl.org/projects/SDL_image/release/SDL_image-devel-1.2.12-VC.zip - - appveyor DownloadFile https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-devel-1.2.12-VC.zip - # Extract files - - 7z x SDL-devel-1.2.15-VC.zip > nul - - 7z x SDL_image-devel-1.2.12-VC.zip > nul - - 7z x SDL_mixer-devel-1.2.12-VC.zip > nul - # Set up includes - - copy SDL-1.2.15\include\* %SDL1_IDIR% > nul - - copy SDL_image-1.2.12\include\* %SDL1_IDIR% > nul - - copy SDL_mixer-1.2.12\include\* %SDL1_IDIR% > nul - # Set up libs - - copy SDL-1.2.15\lib\x86\* %LIBDIR% > nul - - copy SDL_image-1.2.12\lib\x86\* %LIBDIR% > nul - - copy SDL_mixer-1.2.12\lib\x86\* %LIBDIR% > nul # Download SDL2 - appveyor DownloadFile https://www.libsdl.org/release/SDL2-devel-2.0.14-VC.zip - appveyor DownloadFile https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.5-VC.zip @@ -66,13 +47,11 @@ install: build_script: - cd %APPVEYOR_BUILD_FOLDER% - - if [%SDL_VER%]==[1] (set WITH_SDL2=OFF) else (set WITH_SDL2=ON) - - if [%SDL_VER%]==[1] (set WITH_PNG=OFF) else (set WITH_PNG=ON) - cmake -DCMAKE_PREFIX_PATH=%BASEDIR% -DCMAKE_BUILD_TYPE=Release - -DUSE_SDL2_LIBS=%WITH_SDL2% - -DUSE_PNG_SAVE=%WITH_PNG% + -DUSE_SDL2_LIBS=ON + -DUSE_PNG_SAVE=ON -G "Visual Studio 15 2017" . - cmake --build . --config Release