Skip to content

Commit

Permalink
Fix workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Kebekus committed Dec 6, 2023
2 parents 1ecb2c7 + af00498 commit ece1a9a
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "zlib"]
path = zlib
url = https://github.com/madler/zlib.git
[submodule "bzip2"]
path = bzip2
url = https://gitlab.com/bzip2/bzip2.git
20 changes: 20 additions & 0 deletions buildscript-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,26 @@ set -e

for PLATFORM in android_armv7 android_arm64_v8a android_x86 android_x86_64
do
echo
echo "libzip - static for arm64 and x86_64 on iOS"

$Qt6_DIR_BASE/$PLATFORM/bin/qt-cmake \
-G Ninja \
-S libzip \
-B build-libzip-$PLATFORM \
-DBUILD_DOC=OFF \
-DBUILD_EXAMPLES=OFF \
-DBUILD_REGRESS=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DBUILD_TOOLS=OFF \
-DENABLE_BZIP2=OFF \
-DENABLE_LZMA=OFF \
-DENABLE_ZSTD=OFF \
-DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/$PLATFORM
cmake --build build-libzip-$PLATFORM
cmake --install build-libzip-$PLATFORM


echo
echo "Android ARMv7"

Expand Down
29 changes: 27 additions & 2 deletions buildscript-ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@

# Fail on first error
set -e
installDir=Qt/$(basename "$Qt6_DIR_BASE")/ios


echo
echo "bzip2 - static for arm64 and x86_64 on iOS"

$Qt6_DIR_BASE/ios/bin/qt-cmake \
-G Ninja \
-S bzip2 \
-B build-bzip2-iOS \
-DENABLE_APP=OFF \
-DENABLE_DOCS=OFF \
-DENABLE_SHARED_LIB=OFF \
-DENABLE_STATIC_LIB=ON \
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-DCMAKE_INSTALL_PREFIX=$installDir
cmake --build build-bzip2-iOS
cmake --install build-bzip2-iOS


echo
Expand All @@ -12,10 +30,17 @@ $Qt6_DIR_BASE/ios/bin/qt-cmake \
-S zlib \
-B build-zlib-iOS \
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/ios
-DCMAKE_INSTALL_PREFIX=$installDir
cmake --build build-zlib-iOS
cmake --install build-zlib-iOS


echo
echo "copy static bzip2 and zlib to development directory, so cmake can find it"

cp -rv $installDir $Qt6_DIR_BASE


echo
echo "libzip - static for arm64 and x86_64 on iOS"

Expand All @@ -32,6 +57,6 @@ $Qt6_DIR_BASE/ios/bin/qt-cmake \
-DENABLE_LZMA=OFF \
-DENABLE_ZSTD=OFF \
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/ios
-DCMAKE_INSTALL_PREFIX=$installDir
cmake --build build-libzip-iOS
cmake --install build-libzip-iOS
1 change: 1 addition & 0 deletions bzip2
Submodule bzip2 added at 6a8690

0 comments on commit ece1a9a

Please sign in to comment.