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

Fix leftover osx -> macos renames

Browse Source
This commit is contained in:
Twarit Waikar
2022-08-13 21:16:57 +05:30
parent 6e94df54df
commit 34a785dc72
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
godot-git-plugin/SCsub
View File

@@ -8,7 +8,7 @@ Import("env")
godot_headers_path = "../godot-cpp/godot-headers/"
cpp_bindings_path = "../godot-cpp/"
cpp_library = "libgodot-cpp"
target_arch = env["bits"]
target_arch = ""
dynamic_lib_extension = ""
# Process some arguments
@@ -81,10 +81,7 @@ if env["target"] in ("debug", "d"):
else:
cpp_library += ".release"
if env['platform'] == 'macos' and env['macos_arch'] != 'universal':
cpp_library += "." + env['macos_arch']
else:
cpp_library += "." + "x86_64"
cpp_library += "." + target_arch
env.Append(CPPPATH=[".", "src/"])
env.Append(CPPPATH=[

4
thirdparty/git2/SCsub vendored
View File

@@ -85,7 +85,7 @@ if env_git["platform"] == "windows":
]
)
if env_git["platform"] in ["linux", "osx"]:
if env_git["platform"] in ["linux", "macos"]:
env_git.Append(CCFLAGS="-fPIC")
libgit2_sources += Glob("libgit2/src/unix/" + "*.c")
libgit2_sources += [
@@ -126,7 +126,7 @@ if env_git["platform"] in ["linux", "osx"]:
]
)
if env_git["platform"] == "osx":
if env_git["platform"] == "macos":
env_git.Prepend(CPPPATH=[env_git["macos_openssl"] + "include/"])
static_ssl = File(env_git["macos_openssl_static_ssl"])
static_crypto = File(env_git["macos_openssl_static_crypto"])

4
thirdparty/ssh2/SCsub vendored
View File

@@ -57,7 +57,7 @@ if env_ssh2["platform"] == "windows":
)
env_ssh2.Append(LIBS=["crypt32", "user32"])
if env_ssh2["platform"] in ["linux", "osx"]:
if env_ssh2["platform"] in ["linux", "macos"]:
env_ssh2.Append(CCFLAGS="-fPIC")
env_ssh2.Append(
CPPPATH=[
@@ -104,7 +104,7 @@ if env_ssh2["platform"] in ["linux", "osx"]:
]
)
if env_ssh2["platform"] == "osx":
if env_ssh2["platform"] == "macos":
env_ssh2.Append(CPPPATH=[env_ssh2["macos_openssl"] + "include/"])
static_ssl = File(env_ssh2["macos_openssl_static_ssl"])
static_crypto = File(env_ssh2["macos_openssl_static_crypto"])