mirror of
https://github.com/godotengine/godot-git-plugin.git
synced 2026-01-01 01:48:28 +03:00
Add min macOS version flags for master
Frontports https://github.com/godotengine/godot-git-plugin/pull/121/files
This commit is contained in:
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@@ -42,15 +42,15 @@ jobs:
|
||||
path: |
|
||||
demo/
|
||||
|
||||
macos-x64:
|
||||
macos-universal:
|
||||
runs-on: macos-11
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: build-macos-editor-x64
|
||||
- name: build-macos-editor-universal
|
||||
run: |
|
||||
git submodule update --init --recursive
|
||||
brew install scons
|
||||
scons platform=macos target=editor generate_bindings=yes gdextension_dir="../ci/" macos_arch=universal use_llvm=yes -j $(sysctl -n hw.logicalcpu)
|
||||
scons platform=macos target=editor generate_bindings=yes gdextension_dir="../ci/" macos_arch=universal use_llvm=yes macos_deployment_target=10.13 -j $(sysctl -n hw.logicalcpu)
|
||||
otool -L demo/addons/godot-git-plugin/macos/*.dylib
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
OPENSSL_VERSION="1.1.1i"
|
||||
OPENSSL_VERSION="1.1.1s"
|
||||
|
||||
curl -OL http://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
|
||||
tar -xzvf openssl-$OPENSSL_VERSION.tar.gz
|
||||
@@ -12,9 +12,9 @@ cd openssl_arm64
|
||||
make
|
||||
cd ../
|
||||
cd openssl_x86_64
|
||||
./Configure darwin64-x86_64-cc
|
||||
./Configure darwin64-x86_64-cc -mmacosx-version-min=10.13
|
||||
make
|
||||
cd ../
|
||||
lipo -create openssl_arm64/libcrypto.a openssl_x86_64/libcrypto.a -output libcrypto.a
|
||||
lipo -create openssl_arm64/libssl.a openssl_x86_64/libssl.a -output libssl.a
|
||||
lipo -create openssl_arm64/libcrypto.a openssl_x86_64/libcrypto.a -output thirdparty/openssl/libcrypto.a
|
||||
lipo -create openssl_arm64/libssl.a openssl_x86_64/libssl.a -output thirdparty/openssl/libssl.a
|
||||
rm openssl-$OPENSSL_VERSION.tar.gz
|
||||
|
||||
@@ -27,6 +27,12 @@ if env["platform"] == "macos":
|
||||
env.Append(LIBS=[File(env["macos_openssl_static_ssl"]),
|
||||
File(env["macos_openssl_static_crypto"])])
|
||||
|
||||
if env["macos_deployment_target"] != "default":
|
||||
env.Append(CCFLAGS=["-mmacosx-version-min=" +
|
||||
env["macos_deployment_target"]])
|
||||
env.Append(LINKFLAGS=["-mmacosx-version-min=" +
|
||||
env["macos_deployment_target"]])
|
||||
|
||||
elif env["platform"] == "linux":
|
||||
env["target_path"] += "linux/"
|
||||
env.Append(LIBS=[File(env["linux_openssl_static_ssl"]),
|
||||
|
||||
BIN
thirdparty/openssl/libcrypto.a
vendored
BIN
thirdparty/openssl/libcrypto.a
vendored
Binary file not shown.
BIN
thirdparty/openssl/libssl.a
vendored
BIN
thirdparty/openssl/libssl.a
vendored
Binary file not shown.
Reference in New Issue
Block a user