diff options
| author | Leo C | 2014-07-11 17:16:28 +0200 |
|---|---|---|
| committer | Leo C | 2014-07-11 17:16:28 +0200 |
| commit | eded7ec457ef999586c66b15ada5948bddcc735c (patch) | |
| tree | e6fb72fe86054384f8ba893a6aca210c6f58a408 /z180 | |
| parent | 64045ba0916623ab9e7c2f1eed837a2aae081e63 (diff) | |
| download | z180-stamp-eded7ec457ef999586c66b15ada5948bddcc735c.zip | |
Revert "Refactro Tupfiles"
This reverts commit cda2107f6e52a3e131502a6ec318ac3f216ac186.
Diffstat (limited to 'z180')
| -rw-r--r-- | z180/Tupfile | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/z180/Tupfile b/z180/Tupfile index 962b23b..b79d098 100644 --- a/z180/Tupfile +++ b/z180/Tupfile @@ -4,7 +4,6 @@ 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 @@ -18,42 +17,37 @@ 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) $(AS_PREFIX)%B/$(AS_OPT) |> %B.rel | %B.lst +!AS-plain = |> $(AS) -%B/$(AS_OPT) |> %B.rel | %B.lst - -!AS = |> ^ $(AS) $(AS_PREFIX)%B/$(AS_OPT)^ set +e; OUTPUT=\$(mktemp);\ -$(AS) $(AS_PREFIX)%B/$(AS_OPT) > ${OUTPUT};\ +!AS = |> ^ $(AS) -%B/$(AS_OPT)^ set +e; OUTPUT=\$(mktemp);\ +$(AS) -%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 = |> ^o LINK %o^ 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 #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 |