diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 788d828f..2ca6637b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -171,6 +171,7 @@ jobs: certSecureFile: 'developerID_application.p12' certPwd: $(P12Password) - script: | + MACOSX_DEPLOYMENT_TARGET=11 cd $(Build.SourcesDirectory) 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" @@ -228,6 +229,7 @@ jobs: certSecureFile: 'developerID_application.p12' certPwd: $(P12Password) - script: | + MACOSX_DEPLOYMENT_TARGET=10.13 cd $(Build.SourcesDirectory) 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" diff --git a/dependencies/7zip/macx/Version.txt b/dependencies/7zip/macx/Version.txt index 845fb0a7..5a65af32 100644 --- a/dependencies/7zip/macx/Version.txt +++ b/dependencies/7zip/macx/Version.txt @@ -1,5 +1,19 @@ 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: lipo -create -arch arm64 arm64/7z.so -arch x86_64 x86_64/7z.so -o universal/7z.so \ No newline at end of file diff --git a/dependencies/7zip/macx/arm64/7z.so b/dependencies/7zip/macx/arm64/7z.so index 0a4c7e4a..8d57d8ef 100755 Binary files a/dependencies/7zip/macx/arm64/7z.so and b/dependencies/7zip/macx/arm64/7z.so differ diff --git a/dependencies/7zip/macx/universal/7z.so b/dependencies/7zip/macx/universal/7z.so index cf94e537..3eb4b59c 100755 Binary files a/dependencies/7zip/macx/universal/7z.so and b/dependencies/7zip/macx/universal/7z.so differ diff --git a/dependencies/7zip/macx/x86_64/7z.so b/dependencies/7zip/macx/x86_64/7z.so index 13fe4d21..8bbe4a5a 100755 Binary files a/dependencies/7zip/macx/x86_64/7z.so and b/dependencies/7zip/macx/x86_64/7z.so differ