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

Let macOS use the same libssh2 settings as linux

Browse Source
This commit is contained in:
Twarit Waikar
2021-10-12 03:19:20 +05:30
parent 84fa17720c
commit 5cd4ac47fd
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
thirdparty/ssh2/SCsub vendored
View File

@@ -41,11 +41,6 @@ env_ssh2.Prepend(
]
)
env_ssh2.Prepend(
CPPDEFINES=[
]
)
if env_ssh2["platform"] == "windows":
env_ssh2.Append(
CPPPATH=[
@@ -66,8 +61,8 @@ if env_ssh2["platform"] == "osx":
env_ssh2.Append(CCFLAGS = "-fPIC")
env_ssh2.Append(
CPPPATH=[
"."
"libssh2/include/",
"libssh2/os400/"
]
)
libssh2_sources += ["libssh2/src/openssl.c"]
@@ -77,14 +72,8 @@ if env_ssh2["platform"] == "osx":
"HAVE_SYS_UIO_H"
]
)
if env_ssh2["macos_arch"] == "universal":
env_ssh2.Append(LINKFLAGS=["-arch", "x86_64", "-arch", "arm64"])
env_ssh2.Append(CCFLAGS=["-arch", "x86_64", "-arch", "arm64"])
else:
env_ssh2.Append(LINKFLAGS=["-arch", env_ssh2["macos_arch"]])
env_ssh2.Append(CCFLAGS=["-arch", env_ssh2["macos_arch"]])
if env_ssh2["platform"] == "linux":
if env_ssh2["platform"] in ["linux", "osx"]:
env_ssh2.Append(CCFLAGS = "-fPIC")
env_ssh2.Append(
CPPPATH=[
@@ -131,4 +120,12 @@ if env_ssh2["platform"] == "linux":
]
)
if env_ssh2["platform"] == "osx":
if env_ssh2["macos_arch"] == "universal":
env_ssh2.Append(LINKFLAGS=["-arch", "x86_64", "-arch", "arm64"])
env_ssh2.Append(CCFLAGS=["-arch", "x86_64", "-arch", "arm64"])
else:
env_ssh2.Append(LINKFLAGS=["-arch", env_ssh2["macos_arch"]])
env_ssh2.Append(CCFLAGS=["-arch", env_ssh2["macos_arch"]])
env_ssh2.StaticLibrary(target = "../bin/" + "ssh2", source = libssh2_sources)