godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Always use lists for LIBS in SCons

Browse Source 
This closes #31288.

(cherry picked from commit 05daf5c78b)
This commit is contained in:
Hugo Locurcio
2019-08-12 22:30:57 +02:00
committed by Rémi Verschelde
parent dd83296155
commit 41d0e46f2d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mono/config.py
View File

@@ -120,8 +120,8 @@ def configure(env):
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')
@@ -131,7 +131,7 @@ def configure(env):
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

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