Skip to content

Commit f517201

Browse files
committed
[Build] Fix exposed suffix, remove unused option.
1 parent 9d5caf6 commit f517201

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

SConstruct

+3-3
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ opts.Add(
145145
opts.Add(BoolVariable("generate_template_get_node", "Generate a template version of the Node class's get_node.", True))
146146

147147
opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
148-
opts.Add("build_projects", "List of projects to build (comma-separated list of paths).", "")
149148

150149
opts.Update(env)
151150
Help(opts.GenerateHelpText(env))
@@ -236,7 +235,6 @@ elif env["platform"] == "ios":
236235
if env["ios_simulator"]:
237236
sdk_name = "iphonesimulator"
238237
env.Append(CCFLAGS=["-mios-simulator-version-min=10.0"])
239-
env["LIBSUFFIX"] = ".simulator" + env["LIBSUFFIX"]
240238
else:
241239
sdk_name = "iphoneos"
242240
env.Append(CCFLAGS=["-miphoneos-version-min=10.0"])
@@ -486,6 +484,8 @@ if env["platform"] == "android":
486484
arch_suffix = env["android_arch"]
487485
elif env["platform"] == "ios":
488486
arch_suffix = env["ios_arch"]
487+
if env["ios_simulator"]:
488+
arch_suffix += ".simulator"
489489
elif env["platform"] == "javascript":
490490
arch_suffix = "wasm"
491491
elif env["platform"] == "osx":
@@ -499,7 +499,7 @@ if env["build_library"]:
499499
library = env.StaticLibrary(target=env.File("bin/%s" % library_name), source=sources)
500500
Default(library)
501501

502-
env["SHLIBSUFFIX"] = "{}.{}.{}{}".format(env["platform"], env["target"], arch_suffix, env["SHLIBSUFFIX"])
502+
env["SHLIBSUFFIX"] = ".{}.{}.{}{}".format(env["platform"], env["target"], arch_suffix, env["SHLIBSUFFIX"])
503503
env.Append(CPPPATH=[env.Dir(f) for f in ["gen/include", "include", "godot-headers"]])
504504
env.Append(LIBPATH=[env.Dir("bin")])
505505
env.Append(LIBS=library_name)

0 commit comments

Comments
 (0)