mirror of
https://github.com/YACReader/yacreader
synced 2025-05-28 03:10:27 -04:00
Merge pull request #436 from YACReader/mojave-fixes-qt5
Try to use Qt 5.15.10 to make macos builds work in Mojave
This commit is contained in:
commit
996983562f
@ -171,6 +171,7 @@ jobs:
|
|||||||
certSecureFile: 'developerID_application.p12'
|
certSecureFile: 'developerID_application.p12'
|
||||||
certPwd: $(P12Password)
|
certPwd: $(P12Password)
|
||||||
- script: |
|
- script: |
|
||||||
|
MACOSX_DEPLOYMENT_TARGET=11
|
||||||
cd $(Build.SourcesDirectory)
|
cd $(Build.SourcesDirectory)
|
||||||
VERSION="$(cat common/yacreader_global.h | grep '#define VERSION "' | tr -d '#define VERSION' | tr -d '"' )"
|
VERSION="$(cat common/yacreader_global.h | grep '#define VERSION "' | tr -d '#define VERSION' | tr -d '"' )"
|
||||||
echo "Trying to know if we are in a forked repo: $IS_FORK"
|
echo "Trying to know if we are in a forked repo: $IS_FORK"
|
||||||
@ -228,6 +229,7 @@ jobs:
|
|||||||
certSecureFile: 'developerID_application.p12'
|
certSecureFile: 'developerID_application.p12'
|
||||||
certPwd: $(P12Password)
|
certPwd: $(P12Password)
|
||||||
- script: |
|
- script: |
|
||||||
|
MACOSX_DEPLOYMENT_TARGET=10.13
|
||||||
cd $(Build.SourcesDirectory)
|
cd $(Build.SourcesDirectory)
|
||||||
VERSION="$(cat common/yacreader_global.h | grep '#define VERSION "' | tr -d '#define VERSION' | tr -d '"' )"
|
VERSION="$(cat common/yacreader_global.h | grep '#define VERSION "' | tr -d '#define VERSION' | tr -d '"' )"
|
||||||
echo "Trying to know if we are in a forked repo: $IS_FORK"
|
echo "Trying to know if we are in a forked repo: $IS_FORK"
|
||||||
|
14
dependencies/7zip/macx/Version.txt
vendored
14
dependencies/7zip/macx/Version.txt
vendored
@ -1,5 +1,19 @@
|
|||||||
7zip 23.01 built from the original sources using the Format7zF bundle
|
7zip 23.01 built from the original sources using the Format7zF bundle
|
||||||
|
|
||||||
|
x86_64 build (built in an Apple silicon mac):
|
||||||
|
|
||||||
|
export MACOSX_DEPLOYMENT_TARGET=10.13
|
||||||
|
export CC="clang -arch x86_64"
|
||||||
|
export CXX="clang++ -arch x86_64"
|
||||||
|
make -j -f makefile.gcc
|
||||||
|
|
||||||
|
arm64 build (built in an Apple silicon mac):
|
||||||
|
|
||||||
|
export MACOSX_DEPLOYMENT_TARGET=10.13 // minimum will be 11
|
||||||
|
export CC="clang -arch arm64"
|
||||||
|
export CXX="clang++ -arch arm64"
|
||||||
|
make -j -f makefile.gcc
|
||||||
|
|
||||||
Universal binary created using lipo:
|
Universal binary created using lipo:
|
||||||
|
|
||||||
lipo -create -arch arm64 arm64/7z.so -arch x86_64 x86_64/7z.so -o universal/7z.so
|
lipo -create -arch arm64 arm64/7z.so -arch x86_64 x86_64/7z.so -o universal/7z.so
|
BIN
dependencies/7zip/macx/arm64/7z.so
vendored
BIN
dependencies/7zip/macx/arm64/7z.so
vendored
Binary file not shown.
BIN
dependencies/7zip/macx/universal/7z.so
vendored
BIN
dependencies/7zip/macx/universal/7z.so
vendored
Binary file not shown.
BIN
dependencies/7zip/macx/x86_64/7z.so
vendored
BIN
dependencies/7zip/macx/x86_64/7z.so
vendored
Binary file not shown.
Loading…
Reference in New Issue
Block a user