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

SCons: properly close files when reading controller mappings 

Fixup to #17296.
This commit is contained in:
Rémi Verschelde 2018-03-16 08:40:33 +01:00
parent f17c35b447
commit cc617dc5d1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/SCsub
View File

@ -74,10 +74,9 @@ def make_default_controller_mappings(target, source, env):
platform_mappings = OrderedDict()
for src in source:
src_path = src.srcnode().abspath
f = open(src_path, "rb")
# read mapping file and skip header
mapping_file_lines = f.readlines()[2:]
with open(src_path, "rb") as f:
# read mapping file and skip header
mapping_file_lines = f.readlines()[2:]
current_platform = None
for line in mapping_file_lines:
@ -123,6 +122,7 @@ def make_default_controller_mappings(target, source, env):
g.write("#endif\n")
g.write("};\n")
g.close()
env.main_sources = []
env.add_source_files(env.main_sources, "*.cpp")

4
main/default_controller_mappings.h
View File

@ -1,5 +1,5 @@
/*************************************************************************/
/* input_default.h */
/* default_controller_mappings.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -36,4 +36,4 @@ public:
static const char *mappings[];
};
#endif // DEFAULT_CONTROLLER_MAPPINGS_H
#endif // DEFAULT_CONTROLLER_MAPPINGS_H