TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Simplify PCH filename passing

Browse source
This commit is contained in:
Kp 2016-08-17 04:44:22 +00:00
parent 522c37b898
commit 5df6dc47fb
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConstruct
View file

@ -2175,6 +2175,8 @@ class PCHManager(object):
# List of currently active preprocessor guards # List of currently active preprocessor guards
guard = [] guard = []
header_search_path = None header_search_path = None
os_path_join = os.path.join
os_path_exists = os.path.exists
for line in map(str.strip, source_filenode.get_contents().splitlines()): for line in map(str.strip, source_filenode.get_contents().splitlines()):
if preceding_line is not None: if preceding_line is not None:
# Basic support for line continuation. # Basic support for line continuation.
@ -2225,8 +2227,8 @@ class PCHManager(object):
] ]
name = None name = None
for d in header_search_path: for d in header_search_path:
effective_name = os.path.join(d, bare_name) effective_name = os_path_join(d, bare_name)
if os.path.exists(effective_name): if os_path_exists(effective_name):
name = effective_name name = effective_name
break break
if name is None: if name is None:
@ -2241,7 +2243,6 @@ class PCHManager(object):
# will evaluate as false. # will evaluate as false.
continue continue
name = env.File(name) name = env.File(name)
name.__filename = '"%s"' % effective_name
candidates[name].add(tuple(guard)) candidates[name].add(tuple(guard))
elif directive == 'endif': elif directive == 'endif':
# guard should always be True here, but test to avoid # guard should always be True here, but test to avoid
@ -2283,7 +2284,7 @@ class PCHManager(object):
else: else:
# Own header # Own header
cpp_includes = owncpp_includes cpp_includes = owncpp_includes
name = included_file.__filename name = '"%s"' % included_file
threshold = own_header_inclusion_threshold threshold = own_header_inclusion_threshold
if not threshold: if not threshold:
continue continue