Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,11 @@ jobs:
--dep-prefix /Users/runner/work/deps
- name: Build tarball
run: tar -zcf qt-static-macos-${{ matrix.arch }}-${{ matrix.macos }}.tar.gz -C /Users/runner/work/deps qt
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: qt-static-macos-${{ matrix.arch }}-${{ matrix.macos }}-qt
path: qt-static-macos-${{ matrix.arch }}-${{ matrix.macos }}.tar.gz
- name: Upload tarball to nightly release
if: github.event_name == 'push'
uses: ncipollo/release-action@v1
Expand All @@ -283,3 +288,58 @@ jobs:
prerelease: true
replacesArtifacts: true
artifacts: qt-static-macos-${{ matrix.arch }}-${{ matrix.macos }}.tar.gz

qt-static-ios:
needs: [update-nightly-tag, qt-static-macos]
strategy:
matrix:
arch: [ios-arm64, iphonesimulator-arm64, iphonesimulator-x86_64]
include:
- arch: ios-arm64
host_arch: arm64
- arch: iphonesimulator-arm64
host_arch: arm64
- arch: iphonesimulator-x86_64
host_arch: x86_64
runs-on: ${{ matrix.host_arch == 'arm64' && 'macos-14' || 'macos-15-intel' }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- name: Download host Qt
uses: actions/download-artifact@v4
with:
name: qt-static-macos-${{ matrix.host_arch }}-12.0-qt
- name: Extract host Qt
run: |
mkdir -p /Users/runner/work/host-qt
tar -zxf qt-static-macos-${{ matrix.host_arch }}-12.0.tar.gz --strip-components=1 -C /Users/runner/work/host-qt
- name: Cache Qt
id: cache-qt
uses: actions/cache@v4
with:
path: |
/Users/runner/work/deps/qt
key: ${{ github.job }}-${{ matrix.arch }}-qt
- name: Homebrew dependencies to build dependencies
run: brew bundle --file qtox/deps/Brewfile-static
- name: Build Qt
if: steps.cache-qt.outputs.cache-hit != 'true'
run: qtox/deps/local_install_deps.sh
--arch ${{ matrix.arch }}
--dep-file qtox/deps/qt.depfile
--dep-prefix /Users/runner/work/deps
--host-path /Users/runner/work/host-qt
- name: Build tarball
run: tar -zcf qt-static-${{ matrix.arch }}.tar.gz -C /Users/runner/work/deps qt
- name: Upload tarball to nightly release
if: github.event_name == 'push'
uses: ncipollo/release-action@v1
with:
allowUpdates: true
tag: nightly
omitBodyDuringUpdate: true
omitNameDuringUpdate: true
prerelease: true
replacesArtifacts: true
artifacts: qt-static-${{ matrix.arch }}.tar.gz
2 changes: 1 addition & 1 deletion qtox/build_extra_cmake_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "extra-cmake-modules" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm" "$@"
parse_arch --dep "extra-cmake-modules" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

"$SCRIPT_DIR/download/download_extra_cmake_modules.sh"

Expand Down
12 changes: 11 additions & 1 deletion qtox/build_ffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "ffmpeg" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm" "$@"
parse_arch --dep "ffmpeg" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

CONFIGURE_FLAGS=()
if [ "$LIB_TYPE" = "shared" ]; then
Expand Down Expand Up @@ -44,6 +44,16 @@ elif [ "$SCRIPT_ARCH" == "wasm" ]; then
--ranlib="$EMSDK/upstream/bin/llvm-ranlib"
--dep-cc="emcc"
)
elif [[ "$SCRIPT_ARCH" == "ios-"* ]] || [[ "$SCRIPT_ARCH" == "iphonesimulator-"* ]]; then
FFMPEG_ARCH="${SCRIPT_ARCH#*-}"
if [ "$FFMPEG_ARCH" == "x86_64" ]; then
FFMPEG_ARCH="x86_64"
elif [ "$FFMPEG_ARCH" == "arm64" ]; then
FFMPEG_ARCH="aarch64"
fi
TARGET_OS="darwin"
CROSS_PREFIX=""
CONFIGURE_FLAGS+=(--enable-cross-compile)
else
FFMPEG_ARCH=""
TARGET_OS=""
Expand Down
2 changes: 1 addition & 1 deletion qtox/build_hunspell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "hunspell" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 win32 win64" "$@"
parse_arch --dep "hunspell" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

if [ "$LIB_TYPE" = "shared" ]; then
ENABLE_STATIC=--disable-static
Expand Down
2 changes: 1 addition & 1 deletion qtox/build_kimageformats.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "kimageformats" --supported "linux-x86_64 macos-x86_64 macos-arm64 win32 win64" "$@"
parse_arch --dep "kimageformats" --supported "linux-x86_64 macos-x86_64 macos-arm64 win32 win64 ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

"$SCRIPT_DIR/download/download_kimageformats.sh"

Expand Down
2 changes: 1 addition & 1 deletion qtox/build_libexif.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "libexif" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm" "$@"
parse_arch --dep "libexif" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

if [ "$LIB_TYPE" = "shared" ]; then
ENABLE_STATIC=--disable-static
Expand Down
12 changes: 9 additions & 3 deletions qtox/build_openal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "openal" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm" "$@"
parse_arch --dep "openal" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

if [ "$SCRIPT_ARCH" = "win32" ] || [ "$SCRIPT_ARCH" = "win64" ]; then
"$SCRIPT_DIR/download/download_openal.sh" patched
Expand All @@ -32,13 +32,19 @@ else
LIBTYPE=STATIC
fi

if [[ "$SCRIPT_ARCH" == "ios-"* ]] || [[ "$SCRIPT_ARCH" == "iphonesimulator-"* ]]; then
DEPLOYMENT_TARGET="$IOS_MINIMUM_SUPPORTED_VERSION"
else
DEPLOYMENT_TARGET="$MACOS_MINIMUM_SUPPORTED_VERSION"
fi

export CFLAGS="-fPIC"
export CXXFLAGS="-fPIC -std=c++20"
"${EMCMAKE[@]}" cmake \
"$CMAKE_TOOLCHAIN_FILE" \
"${CMAKE_TOOLCHAIN_FILE[@]}" \
-DCMAKE_INSTALL_PREFIX="$DEP_PREFIX" \
-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOS_MINIMUM_SUPPORTED_VERSION" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="$DEPLOYMENT_TARGET" \
-DCMAKE_MACOSX_RPATH="$MACOSX_RPATH" \
-DALSOFT_UTILS=OFF \
-DALSOFT_EXAMPLES=OFF \
Expand Down
8 changes: 7 additions & 1 deletion qtox/build_openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "openssl" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm" "$@"
parse_arch --dep "openssl" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

if [ "$SCRIPT_ARCH" == "win64" ]; then
OPENSSL_ARCH="mingw64"
Expand All @@ -25,6 +25,12 @@ elif [ "$SCRIPT_ARCH" == "macos-x86_64" ]; then
elif [ "$SCRIPT_ARCH" == "macos-arm64" ]; then
OPENSSL_ARCH="darwin64-arm64-cc"
CROSS_COMPILE_ARCH=""
elif [[ "$SCRIPT_ARCH" == "ios-"* ]]; then
OPENSSL_ARCH="ios64-xcrun"
CROSS_COMPILE_ARCH=""
elif [[ "$SCRIPT_ARCH" == "iphonesimulator-"* ]]; then
OPENSSL_ARCH="iossimulator-xcrun"
CROSS_COMPILE_ARCH=""
elif [ "$SCRIPT_ARCH" == "linux-x86_64" ]; then
OPENSSL_ARCH="linux-x86_64"
CROSS_COMPILE_ARCH=""
Expand Down
12 changes: 9 additions & 3 deletions qtox/build_qrencode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "qrencode" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm" "$@"
parse_arch --dep "qrencode" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

if [ "$LIB_TYPE" = "shared" ]; then
BUILD_SHARED_LIBS=ON
Expand All @@ -21,11 +21,17 @@ fi

"$SCRIPT_DIR/download/download_qrencode.sh"

if [[ "$SCRIPT_ARCH" == "ios-"* ]] || [[ "$SCRIPT_ARCH" == "iphonesimulator-"* ]]; then
DEPLOYMENT_TARGET="$IOS_MINIMUM_SUPPORTED_VERSION"
else
DEPLOYMENT_TARGET="$MACOS_MINIMUM_SUPPORTED_VERSION"
fi

"${EMCMAKE[@]}" cmake . \
-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
-DCMAKE_INSTALL_PREFIX="$DEP_PREFIX" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOS_MINIMUM_SUPPORTED_VERSION" \
"$CMAKE_TOOLCHAIN_FILE" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="$DEPLOYMENT_TARGET" \
"${CMAKE_TOOLCHAIN_FILE[@]}" \
-DWITH_TOOLS=OFF \
-DBUILD_SHARED_LIBS="$BUILD_SHARED_LIBS"

Expand Down
22 changes: 17 additions & 5 deletions qtox/build_qtbase_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "qtbase" --supported "macos-arm64 macos-x86_64" "$@"
parse_arch --dep "qtbase" --supported "macos-arm64 macos-x86_64 ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

"$SCRIPT_DIR/download/download_qtbase.sh"

Expand All @@ -29,15 +29,27 @@ else
QT_CONFIGURE_FLAGS+=("-no-force-debug-info")
fi

if [ "$MACOS_MINIMUM_SUPPORTED_VERSION" != "10.15" ]; then
QT_CONFIGURE_FLAGS+=("-no-feature-printsupport")
if [[ "$SCRIPT_ARCH" == "ios-"* ]]; then
QT_CONFIGURE_FLAGS+=("-sdk" "iphoneos" "-no-feature-printsupport" "-no-feature-icu" "-no-feature-filesystemwatcher")
elif [[ "$SCRIPT_ARCH" == "iphonesimulator-"* ]]; then
QT_CONFIGURE_FLAGS+=("-sdk" "iphonesimulator" "-no-feature-printsupport" "-no-feature-icu" "-no-feature-filesystemwatcher")
else
if [ "$MACOS_MINIMUM_SUPPORTED_VERSION" != "10.15" ]; then
QT_CONFIGURE_FLAGS+=("-no-feature-printsupport")
fi
fi

if [ -n "$QT_HOST_PATH" ]; then
QT_CONFIGURE_FLAGS+=("-qt-host-path" "$QT_HOST_PATH")
fi

# We want -Werror to catch warnings related to macOS version compatibility.
sed -i '' -e 's/-Wextra/-Wextra -Werror "-Wno-#warnings" -Wno-cast-function-type-mismatch -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-vla-cxx-extension/' cmake/QtCompilerFlags.cmake
# We silence unused-variable because disabling features (like filesystemwatcher) can leave variables unused in Qt's source.
sed -i '' -e 's/-Wextra/-Wextra -Werror "-Wno-#warnings" -Wno-cast-function-type-mismatch -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-unused-variable -Wno-vla-cxx-extension/' cmake/QtCompilerFlags.cmake

mkdir _build && pushd _build
../configure \
-platform macx-clang \
--prefix="$QT_PREFIX" \
-appstore-compliant \
-static \
Expand All @@ -61,7 +73,7 @@ mkdir _build && pushd _build
-no-openssl \
-- \
-DCMAKE_FIND_ROOT_PATH="$DEP_PREFIX" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOS_MINIMUM_SUPPORTED_VERSION" \
"${CMAKE_TOOLCHAIN_FILE[@]}" \
-Wno-dev
cat config.summary
cmake --build .
Expand Down
2 changes: 1 addition & 1 deletion qtox/build_qtbase_wasm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pushd _build
-no-glib \
-no-openssl \
-device-option "QT_EMSCRIPTEN_ASYNCIFY=1" \
-qt-host-path /opt/buildhome/host/qt \
-qt-host-path "${QT_HOST_PATH:-/opt/buildhome/host/qt}" \
-platform wasm-emscripten \
-feature-thread \
-feature-wasm-simd128 \
Expand Down
2 changes: 1 addition & 1 deletion qtox/build_qtbase_windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ mkdir _build && pushd _build
-no-feature-dbus \
-no-opengl \
-device-option "CROSS_COMPILE=$CROSS_COMPILE" \
-qt-host-path /opt/buildhome/host/qt \
-qt-host-path "$QT_HOST_PATH" \
-platform linux-g++ \
-xplatform win32-g++ \
-openssl-linked \
Expand Down
2 changes: 1 addition & 1 deletion qtox/build_qtimageformats.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "qtimageformats" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64 wasm" "$@"
parse_arch --dep "qtimageformats" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

"$SCRIPT_DIR/download/download_qtimageformats.sh"

Expand Down
2 changes: 1 addition & 1 deletion qtox/build_qtremoteobjects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "qtremoteobjects" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64" "$@"
parse_arch --dep "qtremoteobjects" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64 ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

"$SCRIPT_DIR/download/download_qtremoteobjects.sh"

Expand Down
2 changes: 1 addition & 1 deletion qtox/build_qtsvg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "qtsvg" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64 wasm" "$@"
parse_arch --dep "qtsvg" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

"$SCRIPT_DIR/download/download_qtsvg.sh"

Expand Down
2 changes: 1 addition & 1 deletion qtox/build_qttools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "qttools" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64 wasm" "$@"
parse_arch --dep "qttools" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

"$SCRIPT_DIR/download/download_qttools.sh"

Expand Down
4 changes: 2 additions & 2 deletions qtox/build_sonnet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "sonnet" --supported "linux-x86_64 macos-x86_64 macos-arm64 win32 win64 wasm" "$@"
parse_arch --dep "sonnet" --supported "linux-x86_64 macos-x86_64 macos-arm64 win32 win64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

"$SCRIPT_DIR/download/download_sonnet.sh"

Expand All @@ -37,7 +37,7 @@ else
done < <(find . -name CMakeLists.txt -print0)
sed_i -e 's/ MODULE$/ STATIC/g' "${CMAKE_LISTS[@]}"
sed_i -e 's/install(TARGETS sonnet_\([^ ]*\) /&EXPORT KF6SonnetTargets/g' "${CMAKE_LISTS[@]}"
if [ "$SCRIPT_ARCH" = "macos-x86_64" ] || [ "$SCRIPT_ARCH" = "macos-arm64" ]; then
if [ "$SCRIPT_ARCH" = "macos-x86_64" ] || [ "$SCRIPT_ARCH" = "macos-arm64" ] || [[ "$SCRIPT_ARCH" == "ios-"* ]] || [[ "$SCRIPT_ARCH" == "iphonesimulator-"* ]]; then
sed_i -e 's/target_link_libraries(KF6SonnetCore PUBLIC Qt6::Core)/target_link_libraries(KF6SonnetCore PUBLIC Qt6::Core sonnet_hunspell sonnet_nsspellchecker)/' "${CMAKE_LISTS[@]}"
else
sed_i -e 's/target_link_libraries(KF6SonnetCore PUBLIC Qt6::Core)/target_link_libraries(KF6SonnetCore PUBLIC Qt6::Core sonnet_hunspell)/' "${CMAKE_LISTS[@]}"
Expand Down
2 changes: 1 addition & 1 deletion qtox/build_sqlcipher.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "sqlcipher" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm" "$@"
parse_arch --dep "sqlcipher" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

"$SCRIPT_DIR/download/download_sqlcipher.sh"

Expand Down
5 changes: 4 additions & 1 deletion qtox/build_tomcrypt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "tomcrypt" --supported "linux-aarch64 linux-x86_64 win32 win64 macos-x86_64 macos-arm64 ios-arm64 ios-armv7 ios-armv7s ios-i386 ios-x86_64 wasm" "$@"
parse_arch --dep "tomcrypt" --supported "linux-aarch64 linux-x86_64 win32 win64 macos-x86_64 macos-arm64 ios-arm64 ios-armv7 ios-armv7s ios-i386 ios-x86_64 iphonesimulator-arm64 iphonesimulator-x86_64 wasm" "$@"

if [ "$LIB_TYPE" = "shared" ]; then
MAKEFILE="makefile.shared"
Expand All @@ -19,5 +19,8 @@ fi

"$SCRIPT_DIR/download/download_tomcrypt.sh"

export CFLAGS="-O2 -g0 $CROSS_CFLAG"
export LDFLAGS="$CROSS_LDFLAG"

"${EMMAKE[@]}" make -j "$MAKE_JOBS" -f "$MAKEFILE" library
"${EMMAKE[@]}" make install PREFIX="$DEP_PREFIX"
12 changes: 9 additions & 3 deletions qtox/build_toxcore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "toxcore" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm" "$@"
parse_arch --dep "toxcore" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 wasm ios-arm64 iphonesimulator-arm64 iphonesimulator-x86_64" "$@"

if [ "$LIB_TYPE" = "shared" ]; then
ENABLE_STATIC=OFF
Expand Down Expand Up @@ -44,6 +44,12 @@ if [ -n "$SANITIZE" ]; then
CMAKE_BUILD_TYPE=Debug
fi

if [[ "$SCRIPT_ARCH" == "ios-"* ]] || [[ "$SCRIPT_ARCH" == "iphonesimulator-"* ]]; then
DEPLOYMENT_TARGET="$IOS_MINIMUM_SUPPORTED_VERSION"
else
DEPLOYMENT_TARGET="$MACOS_MINIMUM_SUPPORTED_VERSION"
fi

"${EMCMAKE[@]}" cmake \
-DCMAKE_INSTALL_PREFIX="$DEP_PREFIX" \
-DBOOTSTRAP_DAEMON=OFF \
Expand All @@ -52,8 +58,8 @@ fi
-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
-DENABLE_STATIC="$ENABLE_STATIC" \
-DENABLE_SHARED="$ENABLE_SHARED" \
"$CMAKE_TOOLCHAIN_FILE" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOS_MINIMUM_SUPPORTED_VERSION" \
"${CMAKE_TOOLCHAIN_FILE[@]}" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="$DEPLOYMENT_TARGET" \
-GNinja \
-B_build \
.
Expand Down
Loading
Loading