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

Only build x64 mac builds instead of universal

Browse Source
This commit is contained in:
Twarit Waikar
2021-10-12 21:14:16 +05:30
parent 140dd2675a
commit 14100de179
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ jobs:
run: |
git submodule update --init --recursive
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=universal 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.so
- uses: actions/upload-artifact@v2
with:

10
godot-git-plugin/SCsub
View File

@@ -31,6 +31,8 @@ if not os.path.isdir(env["target_path"]):
if env["platform"] == "osx":
env["target_path"] += "osx/"
cpp_library += ".osx"
env.Append(LIBS=["ssl"])
if env["target"] in ("debug", "d"):
env.Append(CCFLAGS = ["-g","-O2", "-arch", "x86_64", "-arch", "arm64", "-std=c++17"])
env.Append(LINKFLAGS = ["-arch", "x86_64", "-arch", "arm64"])
@@ -68,10 +70,10 @@ if env["target"] in ("debug", "d"):
else:
cpp_library += ".release"
cpp_library += "." + str(bits)
if env['platform'] == 'osx':
if env['macos_arch'] != 'universal':
cpp_library = env['macos_arch']
if env['platform'] == 'osx' and env['macos_arch'] != 'universal':
cpp_library += "." + env['macos_arch']
else:
cpp_library += "." + str(bits)
env.Append(CPPPATH = [".", "src/"])
env.Append(CPPPATH = [godot_headers_path, cpp_bindings_path + "include/", cpp_bindings_path + "include/core/", cpp_bindings_path + "include/gen/"])

10
thirdparty/ssh2/SCsub vendored
View File

@@ -105,11 +105,11 @@ if env_ssh2["platform"] in ["linux", "osx"]:
)
if env_ssh2["platform"] == "osx":
env_ssh2.Append(CPPDEFINES = [
("WORDS_BIGENDIAN", "1"),
("_DARWIN_USE_64_BIT_INODE", "1"),
("AC_APPLE_UNIVERSAL_BUILD", 1)
])
if env_ssh2["macos_arch"] == "universal":
env_ssh2.Append(CPPDEFINES = [
("WORDS_BIGENDIAN", "1"),
("AC_APPLE_UNIVERSAL_BUILD", 1)
])
env_ssh2.Append(CPPPATH = [ "/usr/local/opt/openssl@1.1/include/" ])
env_ssh2.Append(LIBPATH = [ "/usr/local/opt/openssl@1.1/lib/" ])