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

Force static linkage for libssl.a and libcrypt.a

Browse Source
This commit is contained in:
Twarit Waikar
2022-12-21 01:11:15 +05:30
parent 35443ecfaa
commit 0e8de32587
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@@ -20,6 +20,10 @@ opts.Add(PathVariable("macos_openssl_static_ssl", "Path to OpenSSL libssl.a libr
os.path.join(os.path.abspath(os.getcwd()), "thirdparty/openssl/libssl.a"), PathVariable.PathAccept))
opts.Add(PathVariable("macos_openssl_static_crypto", "Path to OpenSSL libcrypto.a library - only used in macOS builds.",
os.path.join(os.path.abspath(os.getcwd()), "thirdparty/openssl/libcrypto.a"), PathVariable.PathAccept))
opts.Add(PathVariable("linux_openssl_static_ssl", "Path to OpenSSL libssl.a library - only used in Linux builds.",
"/usr/lib/x86_64-linux-gnu/libssl.a", PathVariable.PathAccept))
opts.Add(PathVariable("linux_openssl_static_crypto", "Path to OpenSSL libcrypto.a library - only used in Linux builds.",
"/usr/lib/x86_64-linux-gnu/libcrypto.a", PathVariable.PathAccept))
# Updates the environment with the option variables.
opts.Update(env)

14
godot-git-plugin/SCsub
View File

@@ -24,18 +24,19 @@ if env["platform"] == "macos":
env["target_path"] += "macos/"
# Force static linkage (https://stackoverflow.com/a/2995999/7370948)
static_ssl = File(env["macos_openssl_static_ssl"])
static_crypto = File(env["macos_openssl_static_crypto"])
env.Append(LIBS=[static_ssl, static_crypto])
env.Append(LIBS=[File(env["macos_openssl_static_ssl"]),
File(env["macos_openssl_static_crypto"])])
elif env["platform"] == "linux":
env["target_path"] += "linux/"
env.Append(LIBS=["ssl", "crypto"])
env.Append(LIBS=[File(env["linux_openssl_static_ssl"]),
File(env["linux_openssl_static_crypto"])])
elif env["platform"] == "windows":
env["target_path"] += "win64/"
env.Append(LIBS=["advapi32", "winhttp", "rpcrt4", "crypt32", "ole32", "user32", "wsock32", "ws2_32", "bcrypt"])
env.Append(LIBS=["advapi32", "winhttp", "rpcrt4", "crypt32",
"ole32", "user32", "wsock32", "ws2_32", "bcrypt"])
env.Append(CPPPATH=[".", "src/"])
@@ -44,7 +45,8 @@ env.Append(LIBPATH=["../thirdparty/bin/"])
env.Prepend(LIBS=["git2", "ssh2"])
library = env.SharedLibrary(
target=env["target_path"] + "{}{}{}".format(env["target_name"], env["suffix"], env["SHLIBSUFFIX"]),
target=env["target_path"] +
"{}{}{}".format(env["target_name"], env["suffix"], env["SHLIBSUFFIX"]),
source=Glob("src/*.cpp")
)
Default(library)