diff options
author | Leo C | 2015-06-11 17:43:28 +0200 |
---|---|---|
committer | Leo C | 2015-06-11 17:43:28 +0200 |
commit | 1157e75889d3d6d23d1e2514f401cd5b354bd149 (patch) | |
tree | edad2bcaddaec49a18a1b4bac2b813ce9e5a36bf /z180/Tupfile | |
parent | 8506d791786eea8ee55db5418a8f646bb2dd3a6d (diff) | |
parent | 057817cb1dc71416bc798b5cd592acfcea87efaa (diff) | |
download | z180-stamp-1157e75889d3d6d23d1e2514f401cd5b354bd149.zip |
Merge branch 'master' into cmdline_edit
Diffstat (limited to 'z180/Tupfile')
-rw-r--r-- | z180/Tupfile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/z180/Tupfile b/z180/Tupfile index bb88946..50ede98 100644 --- a/z180/Tupfile +++ b/z180/Tupfile @@ -2,12 +2,12 @@ include_rules PROG = hdrom -SRC = r3init.180 +SRC = init.180 SRC += ddtz.180 -#SRC += fifoio.180 msgbuf.180 ser1-i.180 console.180 -SRC += msgbuf-a.180 conbuf-a.180 ser1-i.180 bioscio.180 chario.180 -# serial (asci1) console only: -#SRC += ser1-i.180 console.180 +SRC += msgbuf-a.180 conbuf-a.180 +#SRC += bioscio.180 chario.180 +SRC += console.180 +SRC += asci-p.180 SRC += romend.180 @@ -28,7 +28,7 @@ AS = $(CPMEMU) slr180.com ############################################################################### -!AS-plain = |> $(AS) -%B/$(AS_OPT) |> %B.rel | %B.lst +!AS-plain = |> $(AS) -%B/$(AS_OPT) |> %B.rel | %B.lst !AS = |> ^ $(AS) -%B/$(AS_OPT)^ set +e; OUTPUT=\$(mktemp);\ $(AS) -%B/$(AS_OPT) > ${OUTPUT};\ @@ -36,9 +36,10 @@ grep -q '^ 0 Error(s) Detected' ${OUTPUT}; ERROR=$?;\ [ "${ERROR}" != "0" ] && cat ${OUTPUT};\ [ "${ERROR}" != "0" ] && rm -f %B.rel;\ rm -f ${OUTPUT}; exit ${ERROR} \ -|> %B.rel | %B.lst +|> %B.rel | %B.lst -!LINK = |> ld80 -o %o -ms %O.map -P $(LN_PROG) -D $(LN_DATA) %f |> | %O.map +#!LINK = |> ld80 -o %o -ms %O.map -P $(LN_PROG) -D $(LN_DATA) %f |> | %O.map +!LINK = |> ld80 -o %o -ms %O.map -P $(LN_PROG) %f |> | %O.map #ifndef DEBUG @@ -51,4 +52,3 @@ rm -f ${OUTPUT}; exit ${ERROR} \ #endif - |