Skip to content

Commit

Permalink
Upgrade tools
Browse files Browse the repository at this point in the history
  • Loading branch information
kebekus committed Nov 30, 2023
1 parent aa1b111 commit cb12d55
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 115 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[submodule "maplibre-native-qt"]
path = maplibre-native-qt
url = https://github.com/maplibre/maplibre-native-qt.git
[submodule "libzip"]
path = libzip
url = https://github.com/nih-at/libzip.git
[submodule "zlib"]
path = zlib
url = https://github.com/madler/zlib.git
23 changes: 23 additions & 0 deletions buildscript-android.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash

# Fail on first error
set -e


for PLATFORM in android_armv7 android_arm64_v8a android_x86 android_x86_64
do
echo
echo "Android ARMv7"

$Qt6_DIR_BASE/$PLATFORM/bin/qt-cmake \
-S maplibre-native-qt \
-B build-maplibre-native-qt-$PLATFORM \
-G Ninja \
-DBUILD_TESTING=OFF \
-DCMAKE_C_COMPILER_LAUNCHER="ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
-DCMAKE_PREFIX_PATH=$Qt6_DIR_BASE/$PLATFORM \
-DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/$PLATFORM
cmake --build build-maplibre-native-qt-$PLATFORM
cmake --install build-maplibre-native-qt-$PLATFORM
done
37 changes: 37 additions & 0 deletions buildscript-ios.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash

# Fail on first error
set -e


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

$Qt6_DIR_BASE/ios/bin/qt-cmake \
-G Ninja \
-S zlib \
-B build-zlib-iOS \
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/ios
cmake --build build-zlib-iOS
cmake --install build-zlib-iOS

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

$Qt6_DIR_BASE/ios/bin/qt-cmake \
-G Ninja \
-S libzip \
-B build-libzip-iOS \
-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_OSX_ARCHITECTURES="arm64;x86_64" \
-DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/ios
cmake --build build-libzip-iOS
cmake --install build-libzip-iOS
21 changes: 21 additions & 0 deletions buildscript-linux.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash

# Fail on first error
set -e


echo
echo "Linux Desktop"

$Qt6_DIR_BASE/gcc_64/bin/qt-cmake \
-S maplibre-native-qt \
-B build-maplibre-native-qt-linux \
-G Ninja \
-DMLN_QT_WITH_INTERNAL_ICU=ON \
-DBUILD_TESTING=OFF \
-DCMAKE_C_COMPILER_LAUNCHER="ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
-DCMAKE_PREFIX_PATH=$Qt6_DIR_BASE/gcc_64 \
-DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/gcc_64
cmake --build build-maplibre-native-qt-linux
cmake --install build-maplibre-native-qt-linux
20 changes: 20 additions & 0 deletions buildscript-macos.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

# Fail on first error
set -e


echo
echo "maplibre for macOS Desktop"

$Qt6_DIR_BASE/macos/bin/qt-cmake \
-S maplibre-native-qt \
-B build-maplibre-native-qt-macOS \
-G Ninja \
-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-DBUILD_TESTING=OFF \
-DCMAKE_C_COMPILER_LAUNCHER="ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
-DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/macos
cmake --build build-maplibre-native-qt-macOS
cmake --install build-maplibre-native-qt-macOS
48 changes: 0 additions & 48 deletions buildscript-maplibre-linux.sh

This file was deleted.

67 changes: 0 additions & 67 deletions buildscript-maplibre-macos.sh

This file was deleted.

1 change: 1 addition & 0 deletions libzip
Submodule libzip added at 0b6ebe
1 change: 1 addition & 0 deletions zlib
Submodule zlib added at 643e17

0 comments on commit cb12d55

Please sign in to comment.