From d87aa0dbde172857fa28fcfbd21b303a2d581fda Mon Sep 17 00:00:00 2001 From: David Korth Date: Sat, 29 Mar 2025 22:38:25 -0400 Subject: [PATCH] appveyor.cmd, appveyor.sh: Add ENABLE_ASTC to OPTEN. Also ENABLE_OPENMP in appveyor.cmd. Note that it doesn't actually do anything right now, since we're not doing OFF/ON builds in AppVeyor anymore due to taking too long and timing out after 1hr. --- appveyor.cmd | 2 +- appveyor.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.cmd b/appveyor.cmd index 242cbfef2..53fcb35f3 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -7,7 +7,7 @@ if "%1" == "OFF" ( ) else ( set OPTEN=ON ) -set "OPTFEAT=-DENABLE_EXTRA_SECURITY=%OPTEN% -DENABLE_JPEG=%OPTEN% -DENABLE_XML=%OPTEN% -DENABLE_DECRYPTION=%OPTEN% -DENABLE_UNICE68=%OPTEN% -DENABLE_LIBMSPACK=%OPTEN% -DENABLE_PVRTC=%OPTEN% -DENABLE_ZSTD=%OPTEN% -DENABLE_LZ4=%OPTEN% -DENABLE_LZO=%OPTEN% -DENABLE_NLS=%OPTEN%" +set "OPTFEAT=-DENABLE_EXTRA_SECURITY=%OPTEN% -DENABLE_JPEG=%OPTEN% -DENABLE_XML=%OPTEN% -DENABLE_DECRYPTION=%OPTEN% -DENABLE_UNICE68=%OPTEN% -DENABLE_LIBMSPACK=%OPTEN% -DENABLE_PVRTC=%OPTEN% -DENABLE_ZSTD=%OPTEN% -DENABLE_LZ4=%OPTEN% -DENABLE_LZO=%OPTEN% -DENABLE_NLS=%OPTEN% -DENABLE_OPENMP=%OPTEN% -DENABLE_ASTC=%OPTEN%" :: FIXME: Get multiple compilers working again. :: For now, it's MSVC only for the Windows build. diff --git a/appveyor.sh b/appveyor.sh index 7455ed2b5..85d8ce375 100755 --- a/appveyor.sh +++ b/appveyor.sh @@ -9,8 +9,8 @@ else export OPTEN=ON fi -OPTFEAT="-DENABLE_EXTRA_SECURITY=${OPTEN} -DENABLE_JPEG=${OPTEN} -DENABLE_XML=${OPTEN} -DENABLE_DECRYPTION=${OPTEN} -DENABLE_UNICE68=${OPTEN} -DENABLE_LIBMSPACK=${OPTEN} -DENABLE_PVRTC=${OPTEN} -DENABLE_ZSTD=${OPTEN} -DENABLE_LZ4=${OPTEN} -DENABLE_LZO=${OPTEN} -DENABLE_NLS=${OPTEN} -DENABLE_OPENMP=${OPTEN} -DTRACKER_INSTALL_API_VERSION=3" +OPTFEAT="-DENABLE_EXTRA_SECURITY=${OPTEN} -DENABLE_JPEG=${OPTEN} -DENABLE_XML=${OPTEN} -DENABLE_DECRYPTION=${OPTEN} -DENABLE_UNICE68=${OPTEN} -DENABLE_LIBMSPACK=${OPTEN} -DENABLE_PVRTC=${OPTEN} -DENABLE_ZSTD=${OPTEN} -DENABLE_LZ4=${OPTEN} -DENABLE_LZO=${OPTEN} -DENABLE_NLS=${OPTEN} -DENABLE_OPENMP=${OPTEN} -DENABLE_ASTC=${OPTEN}" mkdir build || true cd build -cmake .. -G Ninja -DBUILD_TESTING=ON -DENABLE_LTO=OFF -DENABLE_PCH=OFF ${OPTFEAT} +cmake .. -G Ninja -DBUILD_TESTING=ON -DENABLE_LTO=OFF -DENABLE_PCH=OFF -DTRACKER_INSTALL_API_VERSION=3 ${OPTFEAT}