diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 068d1cc..c67a434 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,16 +33,10 @@ jobs: . env.sh ./build.sh --all x86_64 - - name: Archive (with Irrlicht) + - name: Archive run: | shopt -s extglob - cd deps && zip -9r ../deps.zip -- */!(PNG|JPEG) - ls -lh ../deps.zip - - - name: Archive (without Irrlicht) - run: | - shopt -s extglob - cd deps && zip -9r ../deps-lite.zip -- */!(Irrlicht) + cd deps && zip -9r ../deps-lite.zip -- */ ls -lh ../deps-lite.zip - name: Upload and tag @@ -51,6 +45,5 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} tag: 'latest' files: | - deps.zip deps-lite.zip if: github.event_name == 'push' && github.ref == 'refs/heads/master' diff --git a/scripts/Irrlicht.sh b/scripts/Irrlicht.sh deleted file mode 100644 index e27bdb6..0000000 --- a/scripts/Irrlicht.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -e -irrlicht_ver=1.9.0mt15 -png_ver=1.6.42 -jpeg_ver=3.0.2 - -download () { - if [ ! -d irrlicht/.git ]; then - git clone https://github.com/minetest/irrlicht irrlicht - pushd irrlicht - git checkout $irrlicht_ver - popd - fi - get_tar_archive libpng "https://download.sourceforge.net/libpng/libpng-${png_ver}.tar.gz" - get_tar_archive libjpeg "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${jpeg_ver}/libjpeg-turbo-${jpeg_ver}.tar.gz" -} - -build () { - # Build libjpg and libpng first because Irrlicht needs them - mkdir -p libpng - pushd libpng - $srcdir/libpng/configure --host=$CROSS_PREFIX - make && make DESTDIR=$PWD install - popd - - mkdir -p libjpeg - pushd libjpeg - cmake $srcdir/libjpeg "${CMAKE_FLAGS[@]}" -DENABLE_SHARED=OFF - make && make DESTDIR=$PWD install - popd - - local libpng=$PWD/libpng/usr/local/lib/libpng.a - local libjpeg=$(echo $PWD/libjpeg/opt/libjpeg-turbo/lib*/libjpeg.a) - cmake $srcdir/irrlicht "${CMAKE_FLAGS[@]}" \ - -DBUILD_SHARED_LIBS=OFF \ - -DPNG_LIBRARY=$libpng \ - -DPNG_PNG_INCLUDE_DIR=$(dirname "$libpng")/../include \ - -DJPEG_LIBRARY=$libjpeg \ - -DJPEG_INCLUDE_DIR=$(dirname "$libjpeg")/../include - make - - cp -p lib/Android/libIrrlichtMt.a $libpng $libjpeg $pkgdir/ - cp -a $srcdir/irrlicht/include $pkgdir/include - cp -a $srcdir/irrlicht/media/Shaders $pkgdir/Shaders -}