Skip to content

Add include search path when preprocessing assembly files for uvision and make_armc5 exports #6356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2018
Merged

Add include search path when preprocessing assembly files for uvision and make_armc5 exports #6356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b72ede
Add ASM flags virtual path for make export
hug-dev Mar 13, 2018
ebc9289
Add ASM include flags in uvision export
hug-dev Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tools/export/makefile/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ def generate(self):
'to_be_compiled']:
ctx[key] = sorted(ctx[key])
ctx.update(self.format_flags())
# Add the virtual path the the include option in the ASM flags
for index, flag in enumerate(ctx['asm_flags']):
if flag.startswith('-I'):
ctx['asm_flags'][index] = "-I" + ctx['vpath'][0] + "/" + ctx['asm_flags'][index][2:]

for templatefile in \
['makefile/%s_%s.tmpl' % (self.TEMPLATE,
Expand Down
2 changes: 1 addition & 1 deletion tools/export/uvision/uvision.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@
<MiscControls>{{asm_flags}}</MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
<IncludePath>{{include_paths}}</IncludePath>
</VariousControls>
</Aads>
<LDads>
Expand Down