godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31336 from Calinou/scons-libs-use-lists 

Always use lists for `LIBS` in SCons
This commit is contained in:
Rémi Verschelde 2019-08-13 12:32:57 +02:00 committed by GitHub
parent 4403744ef9 05daf5c78b
commit 5f1dce4354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mono/build_scripts/mono_configure.py
View File

@ -113,8 +113,8 @@ def configure(env, env_mono):
else: else:
env.Append(LINKFLAGS=os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix)) env.Append(LINKFLAGS=os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix))
env.Append(LIBS='psapi') env.Append(LIBS=['psapi'])
env.Append(LIBS='version') env.Append(LIBS=['version'])
else: else:
mono_lib_name = find_file_in_dir(mono_lib_path, mono_lib_names, extension='.lib') mono_lib_name = find_file_in_dir(mono_lib_path, mono_lib_names, extension='.lib')
@ -124,7 +124,7 @@ def configure(env, env_mono):
if env.msvc: if env.msvc:
env.Append(LINKFLAGS=mono_lib_name + Environment()['LIBSUFFIX']) env.Append(LINKFLAGS=mono_lib_name + Environment()['LIBSUFFIX'])
else: else:
env.Append(LIBS=mono_lib_name) env.Append(LIBS=[mono_lib_name])
mono_bin_path = os.path.join(mono_root, 'bin') mono_bin_path = os.path.join(mono_root, 'bin')

2
platform/SCsub
View File

@ -29,4 +29,4 @@ with open_utf8('register_platform_apis.gen.cpp', 'w') as f:
env.add_source_files(env.platform_sources, 'register_platform_apis.gen.cpp') env.add_source_files(env.platform_sources, 'register_platform_apis.gen.cpp')
lib = env.add_library('platform', env.platform_sources) lib = env.add_library('platform', env.platform_sources)
env.Prepend(LIBS=lib) env.Prepend(LIBS=[lib])