diff options
| author | Leo C | 2014-07-11 17:14:53 +0200 |
|---|---|---|
| committer | Leo C | 2014-07-11 17:14:53 +0200 |
| commit | 64045ba0916623ab9e7c2f1eed837a2aae081e63 (patch) | |
| tree | 2fd245ca15b7f32485e168d4598565efd98f00c4 /z180 | |
| parent | e598b357f1cdfa103c2dc9985321f8c4e11d49ee (diff) | |
| download | z180-stamp-64045ba0916623ab9e7c2f1eed837a2aae081e63.zip | |
Refactor Tupfiles
Diffstat (limited to 'z180')
| -rw-r--r-- | z180/Tupfile | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/z180/Tupfile b/z180/Tupfile index b79d098..962b23b 100644 --- a/z180/Tupfile +++ b/z180/Tupfile @@ -4,6 +4,7 @@ PROG = hdrom SRC = r3init.180 SRC += ddtz.180 +#SRC += ddtz-g.180 SRC += fifoio.180 msgbuf.180 ser1-i.180 console.180 SRC += romend.180 @@ -17,37 +18,42 @@ LN_DATA = C000 DEFS = -DSTM32F1 -DBAUD=115200 ############################################################################### -# Executables CPMEMU = zxcc + #AS = $(CPMEMU) ccpline.com + +AS_PREFIX = - AS = $(CPMEMU) slr180.com +#AS_PREFIX = +#AS = aliados /usr/local/lib/cpm/bin80/slr180.com ############################################################################### -!AS-plain = |> $(AS) -%B/$(AS_OPT) |> %B.rel | %B.lst +!AS-plain = |> $(AS) $(AS_PREFIX)%B/$(AS_OPT) |> %B.rel | %B.lst -!AS = |> ^ $(AS) -%B/$(AS_OPT)^ set +e; OUTPUT=\$(mktemp);\ -$(AS) -%B/$(AS_OPT) > ${OUTPUT};\ + +!AS = |> ^ $(AS) $(AS_PREFIX)%B/$(AS_OPT)^ set +e; OUTPUT=\$(mktemp);\ +$(AS) $(AS_PREFIX)%B/$(AS_OPT) > ${OUTPUT};\ 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 -!LINK = |> ld80 -o %o -ms %O.map -P $(LN_PROG) -D $(LN_DATA) %f |> | %O.map +!LINK = |> ^o LINK %o^ ld80 -o %o -ms %O.map -P $(LN_PROG) -D $(LN_DATA) %f |> | %O.map #ifndef DEBUG + +#: foreach $(SRC) |> cp %f \$(echo %f | tr a-z A-Z) |> %B {uc_src} + : foreach $(SRC) |> !AS |> {objs} : {objs} |> !LINK |> $(PROG).hex : $(PROG).hex |> srec_cat -o %o -c_array %B -C_COMpressed -include %f -Intel |> $(PROG).c | $(PROG).h -#COMMAND="$(AS) -%B/$(AS_OPT)"; \ - - #endif |