From abeb17532b1623d3c482a4f46a545d4014e3681d Mon Sep 17 00:00:00 2001 From: Twarit Waikar Date: Wed, 13 Oct 2021 03:14:10 +0530 Subject: [PATCH] Pick the correct .a libs for macOS OpenSSL --- .github/workflows/build.yml | 2 +- SConstruct | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index baea548..9bb7008 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: - name: build-macos-release-x64 run: | 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) otool -L demo/addons/godot-git-plugin/osx/libgitapi.dylib - uses: actions/upload-artifact@v2 diff --git a/SConstruct b/SConstruct index 984603e..fa952a7 100644 --- a/SConstruct +++ b/SConstruct @@ -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.", "/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.", - "/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.", - "/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. opts.Update(env)