Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #690 from Faless/build/fix_suffix

pull/662/head
Rémi Verschelde 2022-02-10 12:51:21 +01:00 committed by GitHub
parent 9d5caf6baa f5172016b8
commit 63531a89b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@ -145,7 +145,6 @@ opts.Add(
opts.Add(BoolVariable("generate_template_get_node", "Generate a template version of the Node class's get_node.", True)) opts.Add(BoolVariable("generate_template_get_node", "Generate a template version of the Node class's get_node.", True))
opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True)) opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
opts.Add("build_projects", "List of projects to build (comma-separated list of paths).", "")
opts.Update(env) opts.Update(env)
Help(opts.GenerateHelpText(env)) Help(opts.GenerateHelpText(env))
@ -236,7 +235,6 @@ elif env["platform"] == "ios":
if env["ios_simulator"]: if env["ios_simulator"]:
sdk_name = "iphonesimulator" sdk_name = "iphonesimulator"
env.Append(CCFLAGS=["-mios-simulator-version-min=10.0"]) env.Append(CCFLAGS=["-mios-simulator-version-min=10.0"])
env["LIBSUFFIX"] = ".simulator" + env["LIBSUFFIX"]
else: else:
sdk_name = "iphoneos" sdk_name = "iphoneos"
env.Append(CCFLAGS=["-miphoneos-version-min=10.0"]) env.Append(CCFLAGS=["-miphoneos-version-min=10.0"])
@ -486,6 +484,8 @@ if env["platform"] == "android":
arch_suffix = env["android_arch"] arch_suffix = env["android_arch"]
elif env["platform"] == "ios": elif env["platform"] == "ios":
arch_suffix = env["ios_arch"] arch_suffix = env["ios_arch"]
if env["ios_simulator"]:
arch_suffix += ".simulator"
elif env["platform"] == "javascript": elif env["platform"] == "javascript":
arch_suffix = "wasm" arch_suffix = "wasm"
elif env["platform"] == "osx": elif env["platform"] == "osx":
@ -499,7 +499,7 @@ if env["build_library"]:
library = env.StaticLibrary(target=env.File("bin/%s" % library_name), source=sources) library = env.StaticLibrary(target=env.File("bin/%s" % library_name), source=sources)
Default(library) Default(library)
env["SHLIBSUFFIX"] = "{}.{}.{}{}".format(env["platform"], env["target"], arch_suffix, env["SHLIBSUFFIX"]) env["SHLIBSUFFIX"] = ".{}.{}.{}{}".format(env["platform"], env["target"], arch_suffix, env["SHLIBSUFFIX"])
env.Append(CPPPATH=[env.Dir(f) for f in ["gen/include", "include", "godot-headers"]]) env.Append(CPPPATH=[env.Dir(f) for f in ["gen/include", "include", "godot-headers"]])
env.Append(LIBPATH=[env.Dir("bin")]) env.Append(LIBPATH=[env.Dir("bin")])
env.Append(LIBS=library_name) env.Append(LIBS=library_name)