Mercurial > hg > Members > kono > nitros9-code

changeset 2948:780d05a6fab6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rules.mak: Include defs folder and use AFLAGS for object file building This only affects modules and libraries built from object files and subsequently linked (RMA/RLINK style) resp. archived, using the ASM macro or the implicit .as -> .o rule.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 09 Feb 2014 21:06:21 +0100
parents 0c06bcfccc82
children 96809106ab53
files rules.mak
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rules.mak	Sun Feb 09 11:15:16 2014 +0100
+++ b/rules.mak	Sun Feb 09 21:06:21 2014 +0100
@@ -45,7 +45,7 @@
 endif
 
 # RMA/RLINK
-ASM		= lwasm --6309 --format=obj --pragma=pcaspcr,condundefzero,undefextern,dollarnotlocal,export --includedir=.
+ASM		= lwasm --6309 --format=obj --pragma=pcaspcr,condundefzero,undefextern,dollarnotlocal,export --includedir=. --includedir=$(DEFSDIR)
 LINKER		= lwlink --format=os9
 LWAR		= lwar -c
 
@@ -125,7 +125,7 @@
 	$(LINKER) $(LFLAGS) $^ -o$@
 
 %.o: %.as
-	$(ASM) $< -o$@
+	$(ASM) $(AFLAGS) $< $(ASOUT)$@
 
 # File managers
 %.mn: %.asm