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

SCons: Fix uses of [].append instead of env.add_source_files()

Browse Source 
Also added support for SCons project-absolute paths (starting with #) and
warning about duplicates in add_source_files(), and fixed
default_controller_mappings.gen.cpp being included twice after first build
due to *.cpp globbing.

Part of #30270.
This commit is contained in:
Rémi Verschelde
2019-07-22 13:57:39 +02:00
parent 017b224a87
commit 66d09a6b4c
6 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/SCsub
View File

@ -3,7 +3,8 @@
from compat import open_utf8
Import('env')
platform_sources = []
env.platform_sources = []
# Register platform-exclusive APIs
reg_apis_inc = '#include "register_platform_apis.h"\n'
@ -11,7 +12,7 @@ reg_apis = 'void register_platform_apis() {\n'
unreg_apis = 'void unregister_platform_apis() {\n'
for platform in env.platform_apis:
platform_dir = env.Dir(platform)
platform_sources.append(platform_dir.File('api/api.cpp'))
env.add_source_files(env.platform_sources, platform + '/api/api.cpp')
reg_apis += '\tregister_' + platform + '_api();\n'
unreg_apis += '\tunregister_' + platform + '_api();\n'
reg_apis_inc += '#include "' + platform + '/api/api.h"\n'
@ -25,7 +26,7 @@ with open_utf8('register_platform_apis.gen.cpp', 'w') as f:
f.write(reg_apis)
f.write(unreg_apis)
platform_sources.append('register_platform_apis.gen.cpp')
env.add_source_files(env.platform_sources, 'register_platform_apis.gen.cpp')
lib = env.add_library('platform', platform_sources)
lib = env.add_library('platform', env.platform_sources)
env.Prepend(LIBS=lib)