godotengine/godot-git-plugin
1
0
Fork 0
mirror of https://github.com/godotengine/godot-git-plugin.git synced 2026-01-04 22:09:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pick the correct .a libs for macOS OpenSSL

Browse Source
This commit is contained in:
Twarit Waikar
2021-10-13 03:14:10 +05:30
parent 2095757996
commit abeb17532b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -49,7 +49,7 @@ jobs:
- name: build-macos-release-x64 - name: build-macos-release-x64
run: | run: |
git submodule update --init --recursive git submodule update --init --recursive
brew install scons brew install scons openssl@1.1
scons platform=osx target=release bits=64 godot_cpp=yes generate_bindings=yes use_custom_api_file=yes custom_api_file=api.ci.json macos_arch=x86_64 use_llvm=yes -j $(sysctl -n hw.logicalcpu) scons platform=osx target=release bits=64 godot_cpp=yes generate_bindings=yes use_custom_api_file=yes custom_api_file=api.ci.json macos_arch=x86_64 use_llvm=yes -j $(sysctl -n hw.logicalcpu)
otool -L demo/addons/godot-git-plugin/osx/libgitapi.dylib otool -L demo/addons/godot-git-plugin/osx/libgitapi.dylib
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2

4
SConstruct
View File

@@ -30,9 +30,9 @@ opts.Add(EnumVariable("macos_arch", "Target macOS architecture",
opts.Add(PathVariable("macos_openssl", "Path to OpenSSL libraries - only used in macOS builds.", opts.Add(PathVariable("macos_openssl", "Path to OpenSSL libraries - only used in macOS builds.",
"/usr/local/opt/openssl@1.1/", PathVariable.PathAccept)) "/usr/local/opt/openssl@1.1/", PathVariable.PathAccept))
opts.Add(PathVariable("macos_openssl_static_ssl", "Path to OpenSSL libssl.a library - only used in macOS builds.", opts.Add(PathVariable("macos_openssl_static_ssl", "Path to OpenSSL libssl.a library - only used in macOS builds.",
"/usr/local/opt/openssl@1.1/lib/libssl.1.1.a", PathVariable.PathAccept)) "/usr/local/opt/openssl@1.1/lib/libssl.a", PathVariable.PathAccept))
opts.Add(PathVariable("macos_openssl_static_crypto", "Path to OpenSSL libcrypto.a library - only used in macOS builds.", opts.Add(PathVariable("macos_openssl_static_crypto", "Path to OpenSSL libcrypto.a library - only used in macOS builds.",
"/usr/local/opt/openssl@1.1/lib/libcrypto.1.1.a", PathVariable.PathAccept)) "/usr/local/opt/openssl@1.1/lib/libcrypto.a", PathVariable.PathAccept))
# Updates the environment with the option variables. # Updates the environment with the option variables.
opts.Update(env) opts.Update(env)