package/ci: Enable WITH_BASISIMPORTER on appveyor and travis

Signed-off-by: Squareys <[email protected]>
mosra · Aug 31, 2019 · 4b29cc2 · 4b29cc2
1 parent 40ec5b7
commit 4b29cc2
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 0 deletions.
diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat
@@ -67,6 +67,7 @@ cmake .. ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/openal;%APPVEYOR_BUILD_FOLDER%/devil ^
     -DWITH_ASSIMPIMPORTER=OFF ^
+    -DWITH_BASISIMPORTER=ON -DBASISU_DIR=%APPVEYOR_BUILD_FOLDER%/basis_universal ^
     -DWITH_DDSIMPORTER=ON ^
     -DWITH_DEVILIMAGEIMPORTER=ON ^
     -DWITH_DRFLACAUDIOIMPORTER=ON ^

diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat
@@ -69,6 +69,7 @@ cmake .. ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/openal;%APPVEYOR_BUILD_FOLDER%/devil;C:/Tools/vcpkg/installed/x64-windows ^
     -DWITH_ASSIMPIMPORTER=OFF ^
+    -DWITH_BASISIMPORTER=ON -DBASISU_DIR=%APPVEYOR_BUILD_FOLDER%/basis_universal ^
     -DWITH_DDSIMPORTER=ON ^
     -DWITH_DEVILIMAGEIMPORTER=ON ^
     -DWITH_DRFLACAUDIOIMPORTER=ON ^

diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat
@@ -65,6 +65,7 @@ cmake .. ^
     -DCMAKE_SYSTEM_VERSION=10.0 ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DWITH_ASSIMPIMPORTER=OFF ^
+    -DWITH_BASISIMPORTER=ON -DBASISU_DIR=%APPVEYOR_BUILD_FOLDER%/basis_universal ^
     -DWITH_DDSIMPORTER=ON ^
     -DWITH_DEVILIMAGEIMPORTER=OFF ^
     -DWITH_DRFLACAUDIOIMPORTER=OFF ^

diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml
@@ -43,6 +43,11 @@ install:
 - IF NOT "%TARGET%" == "rt" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\DevIL-SDK-x64-1.7.8.zip appveyor DownloadFile http://downloads.sourceforge.net/openil/DevIL-SDK-x64-1.7.8.zip
 - IF NOT "%TARGET%" == "rt" mkdir devil && cd devil && 7z x ..\DevIL-SDK-x64-1.7.8.zip && mkdir lib && move *.lib lib\ && cd ..
 
+# Basis Universal
+- set BASIS_VERSION=600232075851c2fa6bd23f7180434aca7814c93a
+- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\basis_universal-%BASIS_VERSION%.zip appveyor DownloadFile https://github.com/BinomialLLC/basis_universal/archive/%BASIS_VERSION%.zip
+- 7z x %BASIS_VERSION%.zip && ren basis_universal-%BASIS_VERSION% basis_universal
+
 build_script:
 - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "msvc" call package\ci\appveyor-desktop.bat
 - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" call package\ci\appveyor-desktop-mingw.bat
@@ -52,3 +57,4 @@ cache:
 - openal-soft-1.17.2-bin.zip -> package/ci/appveyor-cache-reset.txt
 - libjpeg-turbo-1.5.0.tar.gz -> package/ci/appveyor-cache-reset.txt
 - DevIL-SDK-x64-1.7.8.zip -> package/ci/appveyor-cache-reset.txt
+- basis_universal-%BASIS_VERSION%.zip -> package/ci/appveyor-cache-reset.txt
diff --git a/package/ci/travis-android-arm.sh b/package/ci/travis-android-arm.sh
@@ -79,6 +79,7 @@ cmake .. \
     -DCMAKE_PREFIX_PATH=$HOME/deps \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_ASSIMPIMPORTER=OFF \
+    -DWITH_BASISIMPORTER=ON -DBASISU_DIR=$HOME/basis_universal \
     -DWITH_DDSIMPORTER=ON \
     -DWITH_DRFLACAUDIOIMPORTER=OFF \
     -DWITH_DRMP3AUDIOIMPORTER=OFF \

diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh
@@ -47,6 +47,7 @@ cmake .. \
     -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
     -DCMAKE_BUILD_TYPE=Debug \
     -DWITH_ASSIMPIMPORTER=ON \
+    -DWITH_BASISIMPORTER=ON -DBASISU_DIR=$HOME/basis_universal \
     -DWITH_DDSIMPORTER=ON \
     -DWITH_DEVILIMAGEIMPORTER=ON \
     -DWITH_DRFLACAUDIOIMPORTER=ON \

diff --git a/package/ci/travis-emscripten.sh b/package/ci/travis-emscripten.sh
@@ -85,6 +85,7 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_ASSIMPIMPORTER=OFF \
+    -DWITH_BASISIMPORTER=ON -DBASISU_DIR=$HOME/basis_universal \
     -DWITH_DDSIMPORTER=ON \
     -DWITH_DEVILIMAGEIMPORTER=OFF \
     -DWITH_DRFLACAUDIOIMPORTER=ON \

diff --git a/package/ci/travis-ios-simulator.sh b/package/ci/travis-ios-simulator.sh
@@ -70,6 +70,7 @@ cmake .. \
     -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DWITH_ASSIMPIMPORTER=OFF \
+    -DWITH_BASISIMPORTER=ON -DBASISU_DIR=$HOME/basis_universal \
     -DWITH_DDSIMPORTER=ON \
     -DWITH_DEVILIMAGEIMPORTER=OFF \
     -DWITH_DRFLACAUDIOIMPORTER=ON \

diff --git a/package/ci/travis.yml b/package/ci/travis.yml
@@ -138,6 +138,9 @@ install:
 # FAAD2, HarfBuzz, Assimp, DevIL
 - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "desktop" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install faad2 harfbuzz assimp devil; fi
 
+# Basis Universal
+- export BASIS_VERSION=600232075851c2fa6bd23f7180434aca7814c93a && wget -nc https://github.com/BinomialLLC/basis_universal/archive/$BASIS_VERSION.zip && unzip -q $BASIS_VERSION; mv basis_universal-$BASIS_VERSION $HOME/basis_universal
+
 script:
 - if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ); then ./package/ci/travis-desktop.sh; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "android" ]; then ./package/ci/travis-android-arm.sh; fi