try to use universal on osx

This commit is contained in:
Martin Rotter 2022-07-13 08:01:46 +02:00
parent ab68236cbc
commit a7eecd6cba
2 changed files with 3 additions and 3 deletions

View File

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url> <url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="4.2.3" date="2022-07-07"/> <release version="4.2.3" date="2022-07-13"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

View File

@ -29,7 +29,7 @@ else
pip3 install aqtinstall pip3 install aqtinstall
QTPATH="$(pwd)/Qt" QTPATH="$(pwd)/Qt"
QTVERSION="5.15.2" QTVERSION="6.3.1"
QTBIN="$QTPATH/$QTVERSION/clang_64/bin" QTBIN="$QTPATH/$QTVERSION/clang_64/bin"
echo "Qt bin directory is: $QTBIN" echo "Qt bin directory is: $QTBIN"
@ -50,7 +50,7 @@ git_tag=$(git describe --tags $(git rev-list --tags --max-count=1))
git_revision=$(git rev-parse --short HEAD) git_revision=$(git rev-parse --short HEAD)
mkdir rssguard-build && cd rssguard-build mkdir rssguard-build && cd rssguard-build
cmake .. -G Ninja -DCMAKE_BUILD_TYPE="MinSizeRel" -DCMAKE_INSTALL_PREFIX="$prefix" -DREVISION_FROM_GIT="ON" -DUSE_WEBENGINE="$webengine" -DFEEDLY_CLIENT_ID="$FEEDLY_CLIENT_ID" -DFEEDLY_CLIENT_SECRET="$FEEDLY_CLIENT_SECRET" -DGMAIL_CLIENT_ID="$GMAIL_CLIENT_ID" -DGMAIL_CLIENT_SECRET="$GMAIL_CLIENT_SECRET" -DINOREADER_CLIENT_ID="$INOREADER_CLIENT_ID" -DINOREADER_CLIENT_SECRET="$INOREADER_CLIENT_SECRET" cmake .. -G Ninja -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE="MinSizeRel" -DCMAKE_INSTALL_PREFIX="$prefix" -DREVISION_FROM_GIT="ON" -DUSE_WEBENGINE="$webengine" -DFEEDLY_CLIENT_ID="$FEEDLY_CLIENT_ID" -DFEEDLY_CLIENT_SECRET="$FEEDLY_CLIENT_SECRET" -DGMAIL_CLIENT_ID="$GMAIL_CLIENT_ID" -DGMAIL_CLIENT_SECRET="$GMAIL_CLIENT_SECRET" -DINOREADER_CLIENT_ID="$INOREADER_CLIENT_ID" -DINOREADER_CLIENT_SECRET="$INOREADER_CLIENT_SECRET"
cmake --build . cmake --build .
cmake --install . --prefix "$prefix" cmake --install . --prefix "$prefix"