From 008b4c4e1d952cc71b082f121b7e6d3d9e43132c Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sat, 4 May 2013 22:10:48 +0200 Subject: [PATCH] Replaced whole bunch for Makefiles with a single generic Makefile. - No complex shell logic. - "Source file shadowing" for all targets via vpath. - Dependency handling. - True incremental build. - Don't write into source directories. - Easy cleanup by just removing 'wrk'. --- libsrc/apple2/Makefile | 182 ------------- .../{apple2-auxmem.s => emd/a2.auxmem.s} | 0 .../{apple2-stdjoy.s => joy/a2.stdjoy.s} | 0 .../{apple2-stdmou.s => mou/a2.stdmou.s} | 0 libsrc/apple2/{apple2-ssc.s => ser/a2.ssc.s} | 0 .../{apple2-280-192-8.fnt => tgi/a2.hi.fnt} | Bin .../{apple2-280-192-8.s => tgi/a2.hi.s} | 2 +- .../apple2/{apple2-40-48-16.s => tgi/a2.lo.s} | 2 +- libsrc/apple2enh/Makefile | 187 -------------- libsrc/atari/Makefile | 171 ------------- libsrc/atari/Makefile.inc | 16 ++ .../atari/{atari-130xe.s => emd/atr130xe.s} | 0 .../{atari-multijoy.s => joy/atarimj8.s} | 0 .../atari/{atari-stdjoy.s => joy/ataristd.s} | 0 libsrc/atari/{atari-10.s => tgi/atari10.s} | 0 libsrc/atari/{atari-11.s => tgi/atari11.s} | 0 libsrc/atari/{atari-14.s => tgi/atari14.s} | 0 libsrc/atari/{atari-15.s => tgi/atari15.s} | 0 libsrc/atari/{atari-3.s => tgi/atari3.s} | 0 libsrc/atari/{atari-4.s => tgi/atari4.s} | 0 libsrc/atari/{atari-5.s => tgi/atari5.s} | 0 libsrc/atari/{atari-6.s => tgi/atari6.s} | 0 libsrc/atari/{atari-7.s => tgi/atari7.s} | 0 libsrc/atari/{atari-8.s => tgi/atari8.s} | 0 libsrc/atari/{atari-9.s => tgi/atari9.s} | 0 libsrc/atari/{ => tgi}/atari_tgi_common.inc | 0 libsrc/atari/{atari-10p2.s => tgi/atr10p2.s} | 0 libsrc/atari/{atari-15p2.s => tgi/atr15p2.s} | 0 libsrc/atari/{atari-8p2.s => tgi/atr8p2.s} | 0 libsrc/atari/{atari-9p2.s => tgi/atr9p2.s} | 0 libsrc/atmos/Makefile | 141 ---------- libsrc/atmos/{ => joy}/atmos-pase.s | 0 libsrc/atmos/{ => ser}/atmos-acia.s | 0 libsrc/atmos/{ => tgi}/atmos-228-200-3.s | 0 libsrc/atmos/{ => tgi}/atmos-240-200-2.s | 0 libsrc/c128/Makefile | 147 ----------- libsrc/c128/{ => emd}/c128-georam.s | 0 libsrc/c128/{ => emd}/c128-ram.s | 0 libsrc/c128/{ => emd}/c128-ram2.s | 0 libsrc/c128/{ => emd}/c128-ramcart.s | 0 libsrc/c128/{ => emd}/c128-reu.s | 0 libsrc/c128/{ => emd}/c128-vdc.s | 0 libsrc/c128/{ => joy}/c128-ptvjoy.s | 0 libsrc/c128/{ => joy}/c128-stdjoy.s | 0 libsrc/c128/{ => mou}/c128-1351.s | 0 .../c128/{c128-joymouse.s => mou/c128-joy.s} | 0 .../c128/{c128-potmouse.s => mou/c128-pot.s} | 0 libsrc/c128/{ => ser}/c128-swlink.s | 0 .../c128/{c128-640-200-2.s => tgi/c128-vdc.s} | 2 +- .../{c128-640-480-2.s => tgi/c128-vdc2.s} | 2 +- libsrc/c16/Makefile | 118 --------- libsrc/c16/{ => emd}/c16-ram.s | 0 libsrc/c16/{ => joy}/c16-stdjoy.s | 2 +- libsrc/c64/Makefile | 148 ----------- libsrc/c64/{ => emd}/c64-c256k.s | 0 libsrc/c64/{ => emd}/c64-dqbb.s | 0 libsrc/c64/{ => emd}/c64-georam.s | 0 libsrc/c64/{ => emd}/c64-isepic.s | 0 libsrc/c64/{ => emd}/c64-ram.s | 0 libsrc/c64/{ => emd}/c64-ramcart.s | 0 libsrc/c64/{ => emd}/c64-reu.s | 0 libsrc/c64/{ => emd}/c64-vdc.s | 0 libsrc/c64/{ => emd}/dtv-himem.s | 0 libsrc/c64/{ => joy}/c64-hitjoy.s | 0 libsrc/c64/{ => joy}/c64-numpad.s | 0 libsrc/c64/{ => joy}/c64-ptvjoy.s | 0 libsrc/c64/{ => joy}/c64-stdjoy.s | 0 libsrc/c64/{ => mou}/c64-1351.s | 0 libsrc/c64/{c64-joymouse.s => mou/c64-joy.s} | 0 libsrc/c64/{c64-potmouse.s => mou/c64-pot.s} | 0 libsrc/c64/{ => ser}/c64-swlink.s | 0 libsrc/c64/{c64-320-200-2.s => tgi/c64-hi.s} | 0 libsrc/cbm/Makefile | 114 --------- libsrc/cbm510/Makefile | 128 ---------- libsrc/cbm510/{ => emd}/cbm510-ram.s | 0 .../{cbm510-stdjoy.s => joy/cbm510-std.s} | 3 +- .../{cbm510-stdser.s => ser/cbm510-std.s} | 2 +- libsrc/cbm610/Makefile | 127 --------- libsrc/cbm610/{ => emd}/cbm610-ram.s | 0 .../{cbm610-stdser.s => ser/cbm610-std.s} | 2 +- libsrc/common/Makefile | 223 ---------------- libsrc/conio/Makefile | 63 ----- libsrc/dbg/Makefile | 47 ---- libsrc/em/Makefile | 56 ---- libsrc/geos-apple/Makefile | 83 ------ libsrc/geos-apple/Makefile.inc | 1 + libsrc/geos-apple/disk/Makefile | 10 - libsrc/geos-cbm/Makefile | 87 ------- libsrc/geos-cbm/Makefile.inc | 1 + libsrc/geos-cbm/disk/Makefile | 29 --- libsrc/geos-cbm/drivers/Makefile | 10 - libsrc/geos-cbm/{drivers => emd}/geos-vdc.s | 0 libsrc/geos-cbm/file/Makefile | 8 - .../geos-cbm/{drivers => joy}/geos-stdjoy.s | 0 libsrc/geos-cbm/memory/Makefile | 12 - libsrc/geos-cbm/system/Makefile | 12 - libsrc/geos-cbm/{drivers => tgi}/geos-tgi.s | 0 libsrc/geos-common/Makefile | 94 ------- libsrc/geos-common/common/Makefile | 18 -- libsrc/geos-common/conio/Makefile | 18 -- libsrc/geos-common/disk/Makefile | 19 -- libsrc/geos-common/dlgbox/Makefile | 17 -- libsrc/geos-common/drivers/Makefile | 10 - libsrc/geos-common/file/Makefile | 32 --- libsrc/geos-common/graph/Makefile | 35 --- libsrc/geos-common/memory/Makefile | 18 -- libsrc/geos-common/menuicon/Makefile | 14 - libsrc/geos-common/mousesprite/Makefile | 20 -- libsrc/geos-common/process/Makefile | 11 - libsrc/geos-common/runtime/Makefile | 8 - libsrc/geos-common/system/Makefile | 24 -- .../system}/joy_stddrv.s | 0 .../system}/tgi_colors.s | 0 .../system}/tgi_stddrv.s | 0 libsrc/joystick/Makefile | 52 ---- libsrc/lynx/Makefile | 139 ---------- libsrc/lynx/{ => joy}/lynx-stdjoy.s | 1 - libsrc/lynx/{ => ser}/lynx-comlynx.s | 0 libsrc/lynx/{ => tgi}/lynx-160-102-16.s | 2 +- libsrc/mouse/Makefile | 59 ----- libsrc/nes/Makefile | 150 ----------- libsrc/nes/Makefile.inc | 8 + libsrc/nes/{ => joy}/nes-stdjoy.s | 0 libsrc/nes/{ => tgi}/nes-64-56-2.s | 2 +- libsrc/pet/Makefile | 115 --------- libsrc/pet/{ => joy}/pet-ptvjoy.s | 0 libsrc/pet/{ => joy}/pet-stdjoy.s | 0 libsrc/plus4/Makefile | 138 ---------- libsrc/plus4/{ => joy}/plus4-stdjoy.s | 0 libsrc/plus4/{ => ser}/plus4-stdser.s | 0 libsrc/runtime/Makefile | 240 ------------------ libsrc/serial/Makefile | 56 ---- libsrc/supervision/Makefile | 47 ---- libsrc/tgi/Makefile | 99 -------- libsrc/vic20/Makefile | 105 -------- libsrc/vic20/{ => joy}/vic20-ptvjoy.s | 0 libsrc/vic20/{ => joy}/vic20-stdjoy.s | 0 libsrc/zlib/Makefile | 54 ---- 138 files changed, 36 insertions(+), 3707 deletions(-) delete mode 100644 libsrc/apple2/Makefile rename libsrc/apple2/{apple2-auxmem.s => emd/a2.auxmem.s} (100%) rename libsrc/apple2/{apple2-stdjoy.s => joy/a2.stdjoy.s} (100%) rename libsrc/apple2/{apple2-stdmou.s => mou/a2.stdmou.s} (100%) rename libsrc/apple2/{apple2-ssc.s => ser/a2.ssc.s} (100%) rename libsrc/apple2/{apple2-280-192-8.fnt => tgi/a2.hi.fnt} (100%) rename libsrc/apple2/{apple2-280-192-8.s => tgi/a2.hi.s} (99%) rename libsrc/apple2/{apple2-40-48-16.s => tgi/a2.lo.s} (99%) delete mode 100644 libsrc/apple2enh/Makefile delete mode 100644 libsrc/atari/Makefile create mode 100644 libsrc/atari/Makefile.inc rename libsrc/atari/{atari-130xe.s => emd/atr130xe.s} (100%) rename libsrc/atari/{atari-multijoy.s => joy/atarimj8.s} (100%) rename libsrc/atari/{atari-stdjoy.s => joy/ataristd.s} (100%) rename libsrc/atari/{atari-10.s => tgi/atari10.s} (100%) rename libsrc/atari/{atari-11.s => tgi/atari11.s} (100%) rename libsrc/atari/{atari-14.s => tgi/atari14.s} (100%) rename libsrc/atari/{atari-15.s => tgi/atari15.s} (100%) rename libsrc/atari/{atari-3.s => tgi/atari3.s} (100%) rename libsrc/atari/{atari-4.s => tgi/atari4.s} (100%) rename libsrc/atari/{atari-5.s => tgi/atari5.s} (100%) rename libsrc/atari/{atari-6.s => tgi/atari6.s} (100%) rename libsrc/atari/{atari-7.s => tgi/atari7.s} (100%) rename libsrc/atari/{atari-8.s => tgi/atari8.s} (100%) rename libsrc/atari/{atari-9.s => tgi/atari9.s} (100%) rename libsrc/atari/{ => tgi}/atari_tgi_common.inc (100%) rename libsrc/atari/{atari-10p2.s => tgi/atr10p2.s} (100%) rename libsrc/atari/{atari-15p2.s => tgi/atr15p2.s} (100%) rename libsrc/atari/{atari-8p2.s => tgi/atr8p2.s} (100%) rename libsrc/atari/{atari-9p2.s => tgi/atr9p2.s} (100%) delete mode 100644 libsrc/atmos/Makefile rename libsrc/atmos/{ => joy}/atmos-pase.s (100%) rename libsrc/atmos/{ => ser}/atmos-acia.s (100%) rename libsrc/atmos/{ => tgi}/atmos-228-200-3.s (100%) rename libsrc/atmos/{ => tgi}/atmos-240-200-2.s (100%) delete mode 100644 libsrc/c128/Makefile rename libsrc/c128/{ => emd}/c128-georam.s (100%) rename libsrc/c128/{ => emd}/c128-ram.s (100%) rename libsrc/c128/{ => emd}/c128-ram2.s (100%) rename libsrc/c128/{ => emd}/c128-ramcart.s (100%) rename libsrc/c128/{ => emd}/c128-reu.s (100%) rename libsrc/c128/{ => emd}/c128-vdc.s (100%) rename libsrc/c128/{ => joy}/c128-ptvjoy.s (100%) rename libsrc/c128/{ => joy}/c128-stdjoy.s (100%) rename libsrc/c128/{ => mou}/c128-1351.s (100%) rename libsrc/c128/{c128-joymouse.s => mou/c128-joy.s} (100%) rename libsrc/c128/{c128-potmouse.s => mou/c128-pot.s} (100%) rename libsrc/c128/{ => ser}/c128-swlink.s (100%) rename libsrc/c128/{c128-640-200-2.s => tgi/c128-vdc.s} (99%) rename libsrc/c128/{c128-640-480-2.s => tgi/c128-vdc2.s} (99%) delete mode 100644 libsrc/c16/Makefile rename libsrc/c16/{ => emd}/c16-ram.s (100%) rename libsrc/c16/{ => joy}/c16-stdjoy.s (78%) delete mode 100644 libsrc/c64/Makefile rename libsrc/c64/{ => emd}/c64-c256k.s (100%) mode change 100755 => 100644 rename libsrc/c64/{ => emd}/c64-dqbb.s (100%) mode change 100755 => 100644 rename libsrc/c64/{ => emd}/c64-georam.s (100%) rename libsrc/c64/{ => emd}/c64-isepic.s (100%) mode change 100755 => 100644 rename libsrc/c64/{ => emd}/c64-ram.s (100%) rename libsrc/c64/{ => emd}/c64-ramcart.s (100%) rename libsrc/c64/{ => emd}/c64-reu.s (100%) rename libsrc/c64/{ => emd}/c64-vdc.s (100%) rename libsrc/c64/{ => emd}/dtv-himem.s (100%) rename libsrc/c64/{ => joy}/c64-hitjoy.s (100%) mode change 100755 => 100644 rename libsrc/c64/{ => joy}/c64-numpad.s (100%) rename libsrc/c64/{ => joy}/c64-ptvjoy.s (100%) mode change 100755 => 100644 rename libsrc/c64/{ => joy}/c64-stdjoy.s (100%) rename libsrc/c64/{ => mou}/c64-1351.s (100%) rename libsrc/c64/{c64-joymouse.s => mou/c64-joy.s} (100%) rename libsrc/c64/{c64-potmouse.s => mou/c64-pot.s} (100%) rename libsrc/c64/{ => ser}/c64-swlink.s (100%) rename libsrc/c64/{c64-320-200-2.s => tgi/c64-hi.s} (100%) delete mode 100644 libsrc/cbm/Makefile delete mode 100644 libsrc/cbm510/Makefile rename libsrc/cbm510/{ => emd}/cbm510-ram.s (100%) rename libsrc/cbm510/{cbm510-stdjoy.s => joy/cbm510-std.s} (97%) rename libsrc/cbm510/{cbm510-stdser.s => ser/cbm510-std.s} (99%) delete mode 100644 libsrc/cbm610/Makefile rename libsrc/cbm610/{ => emd}/cbm610-ram.s (100%) rename libsrc/cbm610/{cbm610-stdser.s => ser/cbm610-std.s} (99%) delete mode 100644 libsrc/common/Makefile delete mode 100644 libsrc/conio/Makefile delete mode 100644 libsrc/dbg/Makefile delete mode 100644 libsrc/em/Makefile delete mode 100644 libsrc/geos-apple/Makefile create mode 100644 libsrc/geos-apple/Makefile.inc delete mode 100644 libsrc/geos-apple/disk/Makefile delete mode 100644 libsrc/geos-cbm/Makefile create mode 100644 libsrc/geos-cbm/Makefile.inc delete mode 100644 libsrc/geos-cbm/disk/Makefile delete mode 100644 libsrc/geos-cbm/drivers/Makefile rename libsrc/geos-cbm/{drivers => emd}/geos-vdc.s (100%) delete mode 100644 libsrc/geos-cbm/file/Makefile rename libsrc/geos-cbm/{drivers => joy}/geos-stdjoy.s (100%) delete mode 100644 libsrc/geos-cbm/memory/Makefile delete mode 100644 libsrc/geos-cbm/system/Makefile rename libsrc/geos-cbm/{drivers => tgi}/geos-tgi.s (100%) delete mode 100644 libsrc/geos-common/Makefile delete mode 100644 libsrc/geos-common/common/Makefile delete mode 100644 libsrc/geos-common/conio/Makefile delete mode 100644 libsrc/geos-common/disk/Makefile delete mode 100644 libsrc/geos-common/dlgbox/Makefile delete mode 100644 libsrc/geos-common/drivers/Makefile delete mode 100644 libsrc/geos-common/file/Makefile delete mode 100644 libsrc/geos-common/graph/Makefile delete mode 100644 libsrc/geos-common/memory/Makefile delete mode 100644 libsrc/geos-common/menuicon/Makefile delete mode 100644 libsrc/geos-common/mousesprite/Makefile delete mode 100644 libsrc/geos-common/process/Makefile delete mode 100644 libsrc/geos-common/runtime/Makefile delete mode 100644 libsrc/geos-common/system/Makefile rename libsrc/{geos-cbm/drivers => geos-common/system}/joy_stddrv.s (100%) rename libsrc/{geos-cbm/drivers => geos-common/system}/tgi_colors.s (100%) rename libsrc/{geos-cbm/drivers => geos-common/system}/tgi_stddrv.s (100%) delete mode 100644 libsrc/joystick/Makefile delete mode 100644 libsrc/lynx/Makefile rename libsrc/lynx/{ => joy}/lynx-stdjoy.s (98%) rename libsrc/lynx/{ => ser}/lynx-comlynx.s (100%) rename libsrc/lynx/{ => tgi}/lynx-160-102-16.s (99%) delete mode 100644 libsrc/mouse/Makefile delete mode 100644 libsrc/nes/Makefile create mode 100644 libsrc/nes/Makefile.inc rename libsrc/nes/{ => joy}/nes-stdjoy.s (100%) rename libsrc/nes/{ => tgi}/nes-64-56-2.s (99%) delete mode 100644 libsrc/pet/Makefile rename libsrc/pet/{ => joy}/pet-ptvjoy.s (100%) rename libsrc/pet/{ => joy}/pet-stdjoy.s (100%) delete mode 100644 libsrc/plus4/Makefile rename libsrc/plus4/{ => joy}/plus4-stdjoy.s (100%) rename libsrc/plus4/{ => ser}/plus4-stdser.s (100%) delete mode 100644 libsrc/runtime/Makefile delete mode 100644 libsrc/serial/Makefile delete mode 100644 libsrc/supervision/Makefile delete mode 100644 libsrc/tgi/Makefile delete mode 100644 libsrc/vic20/Makefile rename libsrc/vic20/{ => joy}/vic20-ptvjoy.s (100%) rename libsrc/vic20/{ => joy}/vic20-stdjoy.s (100%) delete mode 100644 libsrc/zlib/Makefile diff --git a/libsrc/apple2/Makefile b/libsrc/apple2/Makefile deleted file mode 100644 index 791aa6dc4..000000000 --- a/libsrc/apple2/Makefile +++ /dev/null @@ -1,182 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = apple2 - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-mou.o: %.mou - @$(CO) -o $(*)-mou.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-mou.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS= closedir.o \ - opendir.o \ - readdir.o \ - rewinddir.o - -S_OBJS= _scrsize.o \ - break.o \ - cclear.o \ - cgetc.o \ - chline.o \ - close.o \ - clrscr.o \ - color.o \ - cout.o \ - cputc.o \ - crt0.o \ - ctype.o \ - curdevice.o \ - cvline.o \ - devicedir.o \ - dioclose.o \ - diocommon.o \ - dioopen.o \ - dioread.o \ - diosectcount.o \ - diosectsize.o \ - diowrite.o \ - dosdetect.o \ - exec.o \ - exehdr.o \ - filedes.o \ - filename.o \ - get_ostype.o \ - getdevice.o \ - gotoxy.o \ - gotoy.o \ - home.o \ - initcwd.o \ - iobuf.o \ - irq.o \ - isdevice.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - mainargs.o \ - mcbdefault.o \ - mli.o \ - mouse_stat_stddrv.o \ - mouse_stddrv.o \ - open.o \ - oserrlist.o \ - oserror.o \ - randomize.o \ - rdkey.o \ - read.o \ - reboot.o \ - revers.o \ - rwcommon.o \ - syschdir.o \ - sysmkdir.o \ - sysremove.o \ - sysrename.o \ - sysrmdir.o \ - systime.o \ - sysuname.o \ - tgi_colors.o \ - tgi_stat_stddrv.o \ - tgi_stddrv.o \ - toascii.o \ - vtabz.o \ - wherex.o \ - wherey.o \ - write.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(MOUS:.mou=-mou.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - -S_EXTRA_OBJS= \ - extra/iobuf-0800.o - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = apple2-auxmem.emd - -JOYS = apple2-stdjoy.joy - -MOUS = apple2-stdmou.mou - -SERS = apple2-ssc.ser - -TGIS = apple2-280-192-8.tgi apple2-40-48-16.tgi - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) $(S_EXTRA_OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) $(S_EXTRA_OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(MOUS:.mou=.o) $(MOUS:.mou=-mou.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/apple2/apple2-auxmem.s b/libsrc/apple2/emd/a2.auxmem.s similarity index 100% rename from libsrc/apple2/apple2-auxmem.s rename to libsrc/apple2/emd/a2.auxmem.s diff --git a/libsrc/apple2/apple2-stdjoy.s b/libsrc/apple2/joy/a2.stdjoy.s similarity index 100% rename from libsrc/apple2/apple2-stdjoy.s rename to libsrc/apple2/joy/a2.stdjoy.s diff --git a/libsrc/apple2/apple2-stdmou.s b/libsrc/apple2/mou/a2.stdmou.s similarity index 100% rename from libsrc/apple2/apple2-stdmou.s rename to libsrc/apple2/mou/a2.stdmou.s diff --git a/libsrc/apple2/apple2-ssc.s b/libsrc/apple2/ser/a2.ssc.s similarity index 100% rename from libsrc/apple2/apple2-ssc.s rename to libsrc/apple2/ser/a2.ssc.s diff --git a/libsrc/apple2/apple2-280-192-8.fnt b/libsrc/apple2/tgi/a2.hi.fnt similarity index 100% rename from libsrc/apple2/apple2-280-192-8.fnt rename to libsrc/apple2/tgi/a2.hi.fnt diff --git a/libsrc/apple2/apple2-280-192-8.s b/libsrc/apple2/tgi/a2.hi.s similarity index 99% rename from libsrc/apple2/apple2-280-192-8.s rename to libsrc/apple2/tgi/a2.hi.s index b8e315f18..ce2814a1c 100644 --- a/libsrc/apple2/apple2-280-192-8.s +++ b/libsrc/apple2/tgi/a2.hi.s @@ -129,7 +129,7 @@ DEFPALETTE: .byte $00, $01, $02, $03, $04, $05, $06, $07 FONT: ; Beagle Bros Shape Mechanic font F.ASCII.SMALL ; modified to exactly reproduce the text glyphs - .incbin "../apple2/apple2-280-192-8.fnt" + .incbin "a2.hi.fnt" ; ------------------------------------------------------------------------ diff --git a/libsrc/apple2/apple2-40-48-16.s b/libsrc/apple2/tgi/a2.lo.s similarity index 99% rename from libsrc/apple2/apple2-40-48-16.s rename to libsrc/apple2/tgi/a2.lo.s index 135c883bc..edea841be 100644 --- a/libsrc/apple2/apple2-40-48-16.s +++ b/libsrc/apple2/tgi/a2.lo.s @@ -344,4 +344,4 @@ BAR: ; ------------------------------------------------------------------------ -.include "../tgi/tgidrv_line.inc" +.include "../../tgi/tgidrv_line.inc" diff --git a/libsrc/apple2enh/Makefile b/libsrc/apple2enh/Makefile deleted file mode 100644 index f27d2fdcd..000000000 --- a/libsrc/apple2enh/Makefile +++ /dev/null @@ -1,187 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = apple2enh - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../apple2 -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I ../apple2 -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: ../apple2/%.c - @$(CC) -o $(notdir $(*).s) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: ../apple2/%.s - @$(AS) -g -o $@ $(AFLAGS) $< - -extra/%.o: ../apple2/extra/%.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-mou.o: %.mou - @$(CO) -o $(*)-mou.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-mou.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS= closedir.o \ - opendir.o \ - readdir.o \ - rewinddir.o - -S_OBJS= _scrsize.o \ - break.o \ - cclear.o \ - cgetc.o \ - chline.o \ - close.o \ - clrscr.o \ - color.o \ - cout.o \ - cputc.o \ - crt0.o \ - ctype.o \ - curdevice.o \ - cvline.o \ - devicedir.o \ - dioclose.o \ - diocommon.o \ - dioopen.o \ - dioread.o \ - diosectcount.o \ - diosectsize.o \ - diowrite.o \ - dosdetect.o \ - exec.o \ - exehdr.o \ - filedes.o \ - filename.o \ - get_ostype.o \ - getdevice.o \ - gotoxy.o \ - gotoy.o \ - home.o \ - initcwd.o \ - iobuf.o \ - irq.o \ - isdevice.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - mainargs.o \ - mcbdefault.o \ - mli.o \ - mouse_stat_stddrv.o \ - mouse_stddrv.o \ - open.o \ - oserrlist.o \ - oserror.o \ - randomize.o \ - rdkey.o \ - read.o \ - reboot.o \ - revers.o \ - rwcommon.o \ - syschdir.o \ - sysmkdir.o \ - sysremove.o \ - sysrename.o \ - sysrmdir.o \ - systime.o \ - sysuname.o \ - textframe.o \ - tgi_colors.o \ - tgi_stat_stddrv.o \ - tgi_stddrv.o \ - toascii.o \ - videomode.o \ - vtabz.o \ - wherex.o \ - wherey.o \ - write.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(MOUS:.mou=-mou.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - -S_EXTRA_OBJS= \ - extra/iobuf-0800.o - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = apple2-auxmem.emd - -JOYS = apple2-stdjoy.joy - -MOUS = apple2-stdmou.mou - -SERS = apple2-ssc.ser - -TGIS = apple2-280-192-8.tgi apple2-40-48-16.tgi - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) $(S_EXTRA_OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) $(S_EXTRA_OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(MOUS:.mou=.o) $(MOUS:.mou=-mou.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/atari/Makefile b/libsrc/atari/Makefile deleted file mode 100644 index 8c8619283..000000000 --- a/libsrc/atari/Makefile +++ /dev/null @@ -1,171 +0,0 @@ -# -# makefile for CC65 Atari runtime library -# -# NUMDRVS - number of supported drives (max. 16) -# 4 bytes for each device are statically allocated -# LINEBUF - support line buffered reads from E: (the number specifies -# the length of the buffer) -# UCASE_FILENAME - all filenames get uppercased -# DEFAULT_DEVICE - if the string passed to the uppercase function doesn't -# include a device (":" at position 2 or 3), provide "Dn:" -# as a default disk device -# n is the value of DEFAULT_DEVICE, unless DYNAMIC_DD is -# also set, in which case it's overridden by a runtime -# check (on SpartaDOS only) -# needs UCASE_FILENAME to be defined, otherwise no effect -# DYNAMIC_DD - determine default disk device at runtime (SpartaDOS only) -# needs DEFAULT_DEVICE to be defined, otherwise no effect - -ATARIDEFS = -DNUMDRVS=4 -DUCASE_FILENAME=1 -DDEFAULT_DEVICE=1 -DLINEBUF=80 -ATARIDEFS += -DDYNAMIC_DD=1 - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = atari - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $(ATARIDEFS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $(ATARIDEFS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o atari_tgi_common.inc - @$(LD) -o $@ -t module $< ../runtime/zeropage.o - - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - break.o \ - cclear.o \ - cgetc.o \ - chline.o \ - clock.o \ - close.o \ - clrscr.o \ - color.o \ - cputc.o \ - crt0.o \ - ctype.o \ - cvline.o \ - dio_cts.o \ - dio_stc.o \ - diopncls.o \ - dioqsize.o \ - dioread.o \ - diowrite.o \ - diowritev.o \ - do_oserr.o \ - dosdetect.o \ - fdtable.o \ - fdtab.o \ - fdtoiocb.o \ - getargs.o \ - getdefdev.o \ - getfd.o \ - gotox.o \ - gotoy.o \ - gotoxy.o \ - graphics.o \ - initcwd.o \ - inviocb.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - lseek.o \ - mul40.o \ - open.o \ - oserrlist.o \ - oserror.o \ - ostype.o \ - posixdirent.o \ - randomize.o \ - read.o \ - revers.o \ - rwcommon.o \ - savevec.o \ - scroll.o \ - setcolor.o \ - siocall.o \ - syschdir.o \ - sysmkdir.o \ - sysremove.o \ - sysrmdir.o \ - systime.o \ - sysuname.o \ - tgi_colors.o \ - tgi_stat_stddrv.o \ - tgi_stddrv.o \ - toascii.o \ - tvtype.o \ - ucase_fn.o \ - wherex.o \ - wherey.o \ - write.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(TGIS:.tgi=-tgi.o) - - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = atari-130xe.emd - -JOYS = atari-stdjoy.joy atari-multijoy.joy - -TGIS = atari-3.tgi atari-4.tgi atari-5.tgi atari-6.tgi atari-7.tgi atari-8.tgi \ - atari-9.tgi atari-10.tgi atari-11.tgi atari-14.tgi atari-15.tgi atari-8p2.tgi \ - atari-9p2.tgi atari-10p2.tgi atari-15p2.tgi - -#-------------------------------------------------------------------------- -# Targets - -all: $(OBJS) $(EMDS) $(JOYS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(TGIS) diff --git a/libsrc/atari/Makefile.inc b/libsrc/atari/Makefile.inc new file mode 100644 index 000000000..a20e1909e --- /dev/null +++ b/libsrc/atari/Makefile.inc @@ -0,0 +1,16 @@ +# NUMDRVS - number of supported drives (max. 16) +# 4 bytes for each device are statically allocated +# LINEBUF - support line buffered reads from E: (the number specifies +# the length of the buffer) +# UCASE_FILENAME - all filenames get uppercased +# DEFAULT_DEVICE - if the string passed to the uppercase function doesn't +# include a device (":" at position 2 or 3), provide "Dn:" +# as a default disk device +# n is the value of DEFAULT_DEVICE, unless DYNAMIC_DD is +# also set, in which case it's overridden by a runtime +# check (on SpartaDOS only) +# needs UCASE_FILENAME to be defined, otherwise no effect +# DYNAMIC_DD - determine default disk device at runtime (SpartaDOS only) +# needs DEFAULT_DEVICE to be defined, otherwise no effect + +CFLAGS += -Wa -DNUMDRVS=4,-DLINEBUF=80,-DUCASE_FILENAME=1,-DDEFAULT_DEVICE=1,-DDYNAMIC_DD=1 diff --git a/libsrc/atari/atari-130xe.s b/libsrc/atari/emd/atr130xe.s similarity index 100% rename from libsrc/atari/atari-130xe.s rename to libsrc/atari/emd/atr130xe.s diff --git a/libsrc/atari/atari-multijoy.s b/libsrc/atari/joy/atarimj8.s similarity index 100% rename from libsrc/atari/atari-multijoy.s rename to libsrc/atari/joy/atarimj8.s diff --git a/libsrc/atari/atari-stdjoy.s b/libsrc/atari/joy/ataristd.s similarity index 100% rename from libsrc/atari/atari-stdjoy.s rename to libsrc/atari/joy/ataristd.s diff --git a/libsrc/atari/atari-10.s b/libsrc/atari/tgi/atari10.s similarity index 100% rename from libsrc/atari/atari-10.s rename to libsrc/atari/tgi/atari10.s diff --git a/libsrc/atari/atari-11.s b/libsrc/atari/tgi/atari11.s similarity index 100% rename from libsrc/atari/atari-11.s rename to libsrc/atari/tgi/atari11.s diff --git a/libsrc/atari/atari-14.s b/libsrc/atari/tgi/atari14.s similarity index 100% rename from libsrc/atari/atari-14.s rename to libsrc/atari/tgi/atari14.s diff --git a/libsrc/atari/atari-15.s b/libsrc/atari/tgi/atari15.s similarity index 100% rename from libsrc/atari/atari-15.s rename to libsrc/atari/tgi/atari15.s diff --git a/libsrc/atari/atari-3.s b/libsrc/atari/tgi/atari3.s similarity index 100% rename from libsrc/atari/atari-3.s rename to libsrc/atari/tgi/atari3.s diff --git a/libsrc/atari/atari-4.s b/libsrc/atari/tgi/atari4.s similarity index 100% rename from libsrc/atari/atari-4.s rename to libsrc/atari/tgi/atari4.s diff --git a/libsrc/atari/atari-5.s b/libsrc/atari/tgi/atari5.s similarity index 100% rename from libsrc/atari/atari-5.s rename to libsrc/atari/tgi/atari5.s diff --git a/libsrc/atari/atari-6.s b/libsrc/atari/tgi/atari6.s similarity index 100% rename from libsrc/atari/atari-6.s rename to libsrc/atari/tgi/atari6.s diff --git a/libsrc/atari/atari-7.s b/libsrc/atari/tgi/atari7.s similarity index 100% rename from libsrc/atari/atari-7.s rename to libsrc/atari/tgi/atari7.s diff --git a/libsrc/atari/atari-8.s b/libsrc/atari/tgi/atari8.s similarity index 100% rename from libsrc/atari/atari-8.s rename to libsrc/atari/tgi/atari8.s diff --git a/libsrc/atari/atari-9.s b/libsrc/atari/tgi/atari9.s similarity index 100% rename from libsrc/atari/atari-9.s rename to libsrc/atari/tgi/atari9.s diff --git a/libsrc/atari/atari_tgi_common.inc b/libsrc/atari/tgi/atari_tgi_common.inc similarity index 100% rename from libsrc/atari/atari_tgi_common.inc rename to libsrc/atari/tgi/atari_tgi_common.inc diff --git a/libsrc/atari/atari-10p2.s b/libsrc/atari/tgi/atr10p2.s similarity index 100% rename from libsrc/atari/atari-10p2.s rename to libsrc/atari/tgi/atr10p2.s diff --git a/libsrc/atari/atari-15p2.s b/libsrc/atari/tgi/atr15p2.s similarity index 100% rename from libsrc/atari/atari-15p2.s rename to libsrc/atari/tgi/atr15p2.s diff --git a/libsrc/atari/atari-8p2.s b/libsrc/atari/tgi/atr8p2.s similarity index 100% rename from libsrc/atari/atari-8p2.s rename to libsrc/atari/tgi/atr8p2.s diff --git a/libsrc/atari/atari-9p2.s b/libsrc/atari/tgi/atr9p2.s similarity index 100% rename from libsrc/atari/atari-9p2.s rename to libsrc/atari/tgi/atr9p2.s diff --git a/libsrc/atmos/Makefile b/libsrc/atmos/Makefile deleted file mode 100644 index 6aa68c1c3..000000000 --- a/libsrc/atmos/Makefile +++ /dev/null @@ -1,141 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = atmos - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-mou.o: %.mou - @$(CO) -o $(*)-mou.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-mou.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - atmos_load.o \ - atmos_save.o \ - cclear.o \ - cgetc.o \ - chline.o \ - clock.o \ - clrscr.o \ - color.o \ - cputc.o \ - crt0.o \ - ctype.o \ - cvline.o \ - gotox.o \ - gotoxy.o \ - gotoy.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - mainargs.o \ - oserrlist.o \ - oserror.o \ - revers.o \ - store_filename.o \ - systime.o \ - sysuname.o \ - tgi_colors.o \ - tgi_stat_stddrv.o \ - tgi_stddrv.o \ - toascii.o \ - wherex.o \ - wherey.o \ - write.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(MOUS:.mou=-mou.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = - -JOYS = atmos-pase.joy - -MOUS = - -SERS = atmos-acia.ser - -TGIS = atmos-240-200-2.tgi atmos-228-200-3.tgi - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(MOUS:.mou=.o) $(MOUS:.mou=-mou.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/atmos/atmos-pase.s b/libsrc/atmos/joy/atmos-pase.s similarity index 100% rename from libsrc/atmos/atmos-pase.s rename to libsrc/atmos/joy/atmos-pase.s diff --git a/libsrc/atmos/atmos-acia.s b/libsrc/atmos/ser/atmos-acia.s similarity index 100% rename from libsrc/atmos/atmos-acia.s rename to libsrc/atmos/ser/atmos-acia.s diff --git a/libsrc/atmos/atmos-228-200-3.s b/libsrc/atmos/tgi/atmos-228-200-3.s similarity index 100% rename from libsrc/atmos/atmos-228-200-3.s rename to libsrc/atmos/tgi/atmos-228-200-3.s diff --git a/libsrc/atmos/atmos-240-200-2.s b/libsrc/atmos/tgi/atmos-240-200-2.s similarity index 100% rename from libsrc/atmos/atmos-240-200-2.s rename to libsrc/atmos/tgi/atmos-240-200-2.s diff --git a/libsrc/c128/Makefile b/libsrc/c128/Makefile deleted file mode 100644 index 90153a57e..000000000 --- a/libsrc/c128/Makefile +++ /dev/null @@ -1,147 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = c128 - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-mou.o: %.mou - @$(CO) -o $(*)-mou.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-mou.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - break.o \ - c64mode.o \ - cgetc.o \ - clrscr.o \ - conio.o \ - crt0.o \ - color.o \ - cputc.o \ - devnum.o \ - fast.o \ - get_tv.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - kernal.o \ - mainargs.o \ - mcbdefault.o \ - mouse_stat_stddrv.o \ - mouse_stddrv.o \ - randomize.o \ - revers.o \ - slow.o \ - status.o \ - systime.o \ - sysuname.o \ - tgi_colors.o \ - tgi_stat_stddrv.o \ - tgi_stddrv.o \ - toggle_videomode.o \ - videomode.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(MOUS:.mou=-mou.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = c128-georam.emd \ - c128-ram.emd \ - c128-ram2.emd \ - c128-ramcart.emd \ - c128-reu.emd \ - c128-vdc.emd - -JOYS = c128-ptvjoy.joy \ - c128-stdjoy.joy - -MOUS = c128-1351.mou \ - c128-joymouse.mou \ - c128-potmouse.mou - -SERS = c128-swlink.ser - -TGIS = c128-640-200-2.tgi \ - c128-640-480-2.tgi - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(MOUS:.mou=.o) $(MOUS:.mou=-mou.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/c128/c128-georam.s b/libsrc/c128/emd/c128-georam.s similarity index 100% rename from libsrc/c128/c128-georam.s rename to libsrc/c128/emd/c128-georam.s diff --git a/libsrc/c128/c128-ram.s b/libsrc/c128/emd/c128-ram.s similarity index 100% rename from libsrc/c128/c128-ram.s rename to libsrc/c128/emd/c128-ram.s diff --git a/libsrc/c128/c128-ram2.s b/libsrc/c128/emd/c128-ram2.s similarity index 100% rename from libsrc/c128/c128-ram2.s rename to libsrc/c128/emd/c128-ram2.s diff --git a/libsrc/c128/c128-ramcart.s b/libsrc/c128/emd/c128-ramcart.s similarity index 100% rename from libsrc/c128/c128-ramcart.s rename to libsrc/c128/emd/c128-ramcart.s diff --git a/libsrc/c128/c128-reu.s b/libsrc/c128/emd/c128-reu.s similarity index 100% rename from libsrc/c128/c128-reu.s rename to libsrc/c128/emd/c128-reu.s diff --git a/libsrc/c128/c128-vdc.s b/libsrc/c128/emd/c128-vdc.s similarity index 100% rename from libsrc/c128/c128-vdc.s rename to libsrc/c128/emd/c128-vdc.s diff --git a/libsrc/c128/c128-ptvjoy.s b/libsrc/c128/joy/c128-ptvjoy.s similarity index 100% rename from libsrc/c128/c128-ptvjoy.s rename to libsrc/c128/joy/c128-ptvjoy.s diff --git a/libsrc/c128/c128-stdjoy.s b/libsrc/c128/joy/c128-stdjoy.s similarity index 100% rename from libsrc/c128/c128-stdjoy.s rename to libsrc/c128/joy/c128-stdjoy.s diff --git a/libsrc/c128/c128-1351.s b/libsrc/c128/mou/c128-1351.s similarity index 100% rename from libsrc/c128/c128-1351.s rename to libsrc/c128/mou/c128-1351.s diff --git a/libsrc/c128/c128-joymouse.s b/libsrc/c128/mou/c128-joy.s similarity index 100% rename from libsrc/c128/c128-joymouse.s rename to libsrc/c128/mou/c128-joy.s diff --git a/libsrc/c128/c128-potmouse.s b/libsrc/c128/mou/c128-pot.s similarity index 100% rename from libsrc/c128/c128-potmouse.s rename to libsrc/c128/mou/c128-pot.s diff --git a/libsrc/c128/c128-swlink.s b/libsrc/c128/ser/c128-swlink.s similarity index 100% rename from libsrc/c128/c128-swlink.s rename to libsrc/c128/ser/c128-swlink.s diff --git a/libsrc/c128/c128-640-200-2.s b/libsrc/c128/tgi/c128-vdc.s similarity index 99% rename from libsrc/c128/c128-640-200-2.s rename to libsrc/c128/tgi/c128-vdc.s index ecc4c8437..e497a5942 100644 --- a/libsrc/c128/c128-640-200-2.s +++ b/libsrc/c128/tgi/c128-vdc.s @@ -775,4 +775,4 @@ VDCWriteReg: ; ------------------------------------------------------------------------ - .include "../tgi/tgidrv_line.inc" + .include "../../tgi/tgidrv_line.inc" diff --git a/libsrc/c128/c128-640-480-2.s b/libsrc/c128/tgi/c128-vdc2.s similarity index 99% rename from libsrc/c128/c128-640-480-2.s rename to libsrc/c128/tgi/c128-vdc2.s index 021b95245..7f2dbdf5c 100644 --- a/libsrc/c128/c128-640-480-2.s +++ b/libsrc/c128/tgi/c128-vdc2.s @@ -789,4 +789,4 @@ VDCWriteReg: ; ------------------------------------------------------------------------ - .include "../tgi/tgidrv_line.inc" + .include "../../tgi/tgidrv_line.inc" diff --git a/libsrc/c16/Makefile b/libsrc/c16/Makefile deleted file mode 100644 index 7eb6ba756..000000000 --- a/libsrc/c16/Makefile +++ /dev/null @@ -1,118 +0,0 @@ -# -# makefile for CC65 runtime library (C16) -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = c16 - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I. -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - break.o \ - cgetc.o \ - clrscr.o \ - color.o \ - conio.o \ - cputc.o \ - crt0.o \ - devnum.o \ - get_tv.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - kclose.o \ - kernal.o \ - mainargs.o \ - randomize.o \ - revers.o \ - status.o \ - systime.o \ - sysuname.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = c16-ram.emd - -JOYS = c16-stdjoy.joy - -SERS = - -TGIS = - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(SERS) $(TGIS) diff --git a/libsrc/c16/c16-ram.s b/libsrc/c16/emd/c16-ram.s similarity index 100% rename from libsrc/c16/c16-ram.s rename to libsrc/c16/emd/c16-ram.s diff --git a/libsrc/c16/c16-stdjoy.s b/libsrc/c16/joy/c16-stdjoy.s similarity index 78% rename from libsrc/c16/c16-stdjoy.s rename to libsrc/c16/joy/c16-stdjoy.s index 506ebaa23..a448f30e8 100644 --- a/libsrc/c16/c16-stdjoy.s +++ b/libsrc/c16/joy/c16-stdjoy.s @@ -5,5 +5,5 @@ ; Ullrich von Bassewitz, 2002-12-21 ; - .include "../plus4/plus4-stdjoy.s" + .include "../../plus4/joy/plus4-stdjoy.s" diff --git a/libsrc/c64/Makefile b/libsrc/c64/Makefile deleted file mode 100644 index 31ed04282..000000000 --- a/libsrc/c64/Makefile +++ /dev/null @@ -1,148 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = c64 - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-mou.o: %.mou - @$(CO) -o $(*)-mou.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-mou.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - break.o \ - crt0.o \ - cgetc.o \ - clrscr.o \ - color.o \ - conio.o \ - cputc.o \ - devnum.o \ - get_ostype.o \ - get_tv.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - kernal.o \ - kplot.o \ - mainargs.o \ - mcbdefault.o \ - mouse_stat_stddrv.o \ - mouse_stddrv.o \ - randomize.o \ - revers.o \ - status.o \ - systime.o \ - sysuname.o \ - tgi_colors.o \ - tgi_stat_stddrv.o \ - tgi_stddrv.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(MOUS:.mou=-mou.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = c64-c256k.emd \ - c64-dqbb.emd \ - c64-georam.emd \ - c64-isepic.emd \ - c64-ram.emd \ - c64-ramcart.emd \ - c64-reu.emd \ - c64-vdc.emd \ - dtv-himem.emd - -JOYS = c64-hitjoy.joy \ - c64-numpad.joy \ - c64-ptvjoy.joy \ - c64-stdjoy.joy - -MOUS = c64-1351.mou \ - c64-joymouse.mou \ - c64-potmouse.mou - -SERS = c64-swlink.ser - -TGIS = c64-320-200-2.tgi - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(MOUS:.mou=.o) $(MOUS:.mou=-mou.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/c64/c64-c256k.s b/libsrc/c64/emd/c64-c256k.s old mode 100755 new mode 100644 similarity index 100% rename from libsrc/c64/c64-c256k.s rename to libsrc/c64/emd/c64-c256k.s diff --git a/libsrc/c64/c64-dqbb.s b/libsrc/c64/emd/c64-dqbb.s old mode 100755 new mode 100644 similarity index 100% rename from libsrc/c64/c64-dqbb.s rename to libsrc/c64/emd/c64-dqbb.s diff --git a/libsrc/c64/c64-georam.s b/libsrc/c64/emd/c64-georam.s similarity index 100% rename from libsrc/c64/c64-georam.s rename to libsrc/c64/emd/c64-georam.s diff --git a/libsrc/c64/c64-isepic.s b/libsrc/c64/emd/c64-isepic.s old mode 100755 new mode 100644 similarity index 100% rename from libsrc/c64/c64-isepic.s rename to libsrc/c64/emd/c64-isepic.s diff --git a/libsrc/c64/c64-ram.s b/libsrc/c64/emd/c64-ram.s similarity index 100% rename from libsrc/c64/c64-ram.s rename to libsrc/c64/emd/c64-ram.s diff --git a/libsrc/c64/c64-ramcart.s b/libsrc/c64/emd/c64-ramcart.s similarity index 100% rename from libsrc/c64/c64-ramcart.s rename to libsrc/c64/emd/c64-ramcart.s diff --git a/libsrc/c64/c64-reu.s b/libsrc/c64/emd/c64-reu.s similarity index 100% rename from libsrc/c64/c64-reu.s rename to libsrc/c64/emd/c64-reu.s diff --git a/libsrc/c64/c64-vdc.s b/libsrc/c64/emd/c64-vdc.s similarity index 100% rename from libsrc/c64/c64-vdc.s rename to libsrc/c64/emd/c64-vdc.s diff --git a/libsrc/c64/dtv-himem.s b/libsrc/c64/emd/dtv-himem.s similarity index 100% rename from libsrc/c64/dtv-himem.s rename to libsrc/c64/emd/dtv-himem.s diff --git a/libsrc/c64/c64-hitjoy.s b/libsrc/c64/joy/c64-hitjoy.s old mode 100755 new mode 100644 similarity index 100% rename from libsrc/c64/c64-hitjoy.s rename to libsrc/c64/joy/c64-hitjoy.s diff --git a/libsrc/c64/c64-numpad.s b/libsrc/c64/joy/c64-numpad.s similarity index 100% rename from libsrc/c64/c64-numpad.s rename to libsrc/c64/joy/c64-numpad.s diff --git a/libsrc/c64/c64-ptvjoy.s b/libsrc/c64/joy/c64-ptvjoy.s old mode 100755 new mode 100644 similarity index 100% rename from libsrc/c64/c64-ptvjoy.s rename to libsrc/c64/joy/c64-ptvjoy.s diff --git a/libsrc/c64/c64-stdjoy.s b/libsrc/c64/joy/c64-stdjoy.s similarity index 100% rename from libsrc/c64/c64-stdjoy.s rename to libsrc/c64/joy/c64-stdjoy.s diff --git a/libsrc/c64/c64-1351.s b/libsrc/c64/mou/c64-1351.s similarity index 100% rename from libsrc/c64/c64-1351.s rename to libsrc/c64/mou/c64-1351.s diff --git a/libsrc/c64/c64-joymouse.s b/libsrc/c64/mou/c64-joy.s similarity index 100% rename from libsrc/c64/c64-joymouse.s rename to libsrc/c64/mou/c64-joy.s diff --git a/libsrc/c64/c64-potmouse.s b/libsrc/c64/mou/c64-pot.s similarity index 100% rename from libsrc/c64/c64-potmouse.s rename to libsrc/c64/mou/c64-pot.s diff --git a/libsrc/c64/c64-swlink.s b/libsrc/c64/ser/c64-swlink.s similarity index 100% rename from libsrc/c64/c64-swlink.s rename to libsrc/c64/ser/c64-swlink.s diff --git a/libsrc/c64/c64-320-200-2.s b/libsrc/c64/tgi/c64-hi.s similarity index 100% rename from libsrc/c64/c64-320-200-2.s rename to libsrc/c64/tgi/c64-hi.s diff --git a/libsrc/cbm/Makefile b/libsrc/cbm/Makefile deleted file mode 100644 index fa64e4f7c..000000000 --- a/libsrc/cbm/Makefile +++ /dev/null @@ -1,114 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS = cbm_dir.o \ - cbm_load.o \ - cbm_save.o \ - opendir.o \ - readdir.o \ - seekdir.o - -S_OBJS = c_acptr.o \ - c_basin.o \ - c_bsout.o \ - c_chkin.o \ - c_ciout.o \ - c_ckout.o \ - c_clall.o \ - c_close.o \ - c_clrch.o \ - c_getin.o \ - c_iobase.o \ - c_listen.o \ - c_load.o \ - c_open.o \ - c_readst.o \ - c_save.o \ - c_setlfs.o \ - c_setnam.o \ - c_talk.o \ - c_unlsn.o \ - c_untlk.o \ - cbm_close.o \ - cbm_filetype.o \ - cbm_open.o \ - cbm_read.o \ - cbm_write.o \ - cclear.o \ - chline.o \ - clock.o \ - close.o \ - closedir.o \ - ctype.o \ - curdevice.o \ - cvline.o \ - devicedir.o \ - dir.o \ - diskcmd.o \ - diskinit.o \ - exehdr.o \ - filedes.o \ - filename.o \ - filetype.o \ - filevars.o \ - getdevice.o \ - gotox.o \ - gotoxy.o \ - gotoy.o \ - initcwd.o \ - loadaddr.o \ - open.o \ - oserrlist.o \ - oserror.o \ - read.o \ - rewinddir.o \ - rwcommon.o \ - scratch.o \ - syschdir.o \ - sysremove.o \ - sysrename.o \ - telldir.o \ - toascii.o \ - wherex.o \ - wherey.o \ - write.o - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @$(RM) *~ *.bck $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) - -zap: clean diff --git a/libsrc/cbm510/Makefile b/libsrc/cbm510/Makefile deleted file mode 100644 index 69cea06b7..000000000 --- a/libsrc/cbm510/Makefile +++ /dev/null @@ -1,128 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = cbm510 - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - banking.o \ - break.o \ - cgetc.o \ - clrscr.o \ - color.o \ - cputc.o \ - crt0.o \ - devnum.o \ - extzp.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - kclose.o \ - kernal.o \ - kiobase.o \ - kopen.o \ - krdtim.o \ - kreadst.o \ - kscnkey.o \ - kscreen.o \ - ksetnam.o \ - ksettim.o \ - kudtim.o \ - mainargs.o \ - peeksys.o \ - pokesys.o \ - randomize.o \ - revers.o \ - systime.o \ - sysuname.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = cbm510-ram.emd - -JOYS = cbm510-stdjoy.joy - -SERS = cbm510-stdser.ser - -TGIS = - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(SERS) $(TGIS) - diff --git a/libsrc/cbm510/cbm510-ram.s b/libsrc/cbm510/emd/cbm510-ram.s similarity index 100% rename from libsrc/cbm510/cbm510-ram.s rename to libsrc/cbm510/emd/cbm510-ram.s diff --git a/libsrc/cbm510/cbm510-stdjoy.s b/libsrc/cbm510/joy/cbm510-std.s similarity index 97% rename from libsrc/cbm510/cbm510-stdjoy.s rename to libsrc/cbm510/joy/cbm510-std.s index 5b7ec56a2..42f9696a7 100644 --- a/libsrc/cbm510/cbm510-stdjoy.s +++ b/libsrc/cbm510/joy/cbm510-std.s @@ -6,12 +6,11 @@ ; .include "zeropage.inc" - .include "extzp.inc" + .include "../extzp.inc" .include "joy-kernel.inc" .include "joy-error.inc" .include "cbm510.inc" - .include "extzp.inc" .macpack generic diff --git a/libsrc/cbm510/cbm510-stdser.s b/libsrc/cbm510/ser/cbm510-std.s similarity index 99% rename from libsrc/cbm510/cbm510-stdser.s rename to libsrc/cbm510/ser/cbm510-std.s index 712fe0588..eeaddaf68 100644 --- a/libsrc/cbm510/cbm510-stdser.s +++ b/libsrc/cbm510/ser/cbm510-std.s @@ -22,7 +22,7 @@ ; .include "zeropage.inc" - .include "extzp.inc" + .include "../extzp.inc" .include "ser-kernel.inc" .include "ser-error.inc" .include "cbm510.inc" diff --git a/libsrc/cbm610/Makefile b/libsrc/cbm610/Makefile deleted file mode 100644 index f4f26af78..000000000 --- a/libsrc/cbm610/Makefile +++ /dev/null @@ -1,127 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = cbm610 - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - banking.o \ - break.o \ - cgetc.o \ - clrscr.o \ - color.o \ - cputc.o \ - crt0.o \ - crtc.o \ - devnum.o \ - extzp.o \ - get_tv.o \ - irq.o \ - kbhit.o \ - kclose.o \ - kernal.o \ - kiobase.o \ - kopen.o \ - krdtim.o \ - kreadst.o \ - kscnkey.o \ - kscreen.o \ - ksetnam.o \ - ksettim.o \ - kudtim.o \ - mainargs.o \ - peeksys.o \ - pokesys.o \ - randomize.o \ - revers.o \ - systime.o \ - sysuname.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = cbm610-ram.emd - -JOYS = - -SERS = cbm610-stdser.ser - -TGIS = - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(SERS) $(TGIS) diff --git a/libsrc/cbm610/cbm610-ram.s b/libsrc/cbm610/emd/cbm610-ram.s similarity index 100% rename from libsrc/cbm610/cbm610-ram.s rename to libsrc/cbm610/emd/cbm610-ram.s diff --git a/libsrc/cbm610/cbm610-stdser.s b/libsrc/cbm610/ser/cbm610-std.s similarity index 99% rename from libsrc/cbm610/cbm610-stdser.s rename to libsrc/cbm610/ser/cbm610-std.s index 563083267..a5da97e4d 100644 --- a/libsrc/cbm610/cbm610-stdser.s +++ b/libsrc/cbm610/ser/cbm610-std.s @@ -22,7 +22,7 @@ ; .include "zeropage.inc" - .include "extzp.inc" + .include "../extzp.inc" .include "ser-kernel.inc" .include "ser-error.inc" .include "cbm610.inc" diff --git a/libsrc/common/Makefile b/libsrc/common/Makefile deleted file mode 100644 index 334521daf..000000000 --- a/libsrc/common/Makefile +++ /dev/null @@ -1,223 +0,0 @@ -# -*- makefile -*- -# -# makefile for CC65's common library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -g -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Rules to help us see what code the compiler and assembler make. - -%.s : %.c - @$(CC) $(CFLAGS) -S $< - -%.lst : %.s - @$(AS) $(AFLAGS) -l -o /dev/null $< - -#-------------------------------------------------------------------------- -# Object files - -# From C source-files -C_OBJS = _afailed.o \ - _hextab.o \ - _longminstr.o \ - _poserror.o \ - _scanf.o \ - abort.o \ - asctime.o \ - bsearch.o \ - errormsg.o \ - fdopen.o \ - fgetc.o \ - fgetpos.o \ - fgets.o \ - fputc.o \ - fputs.o \ - freopen.o \ - fseek.o \ - fsetpos.o \ - ftell.o \ - getchar.o \ - getopt.o \ - gets.o \ - gmtime.o \ - locale.o \ - localtime.o \ - mktime.o \ - perror.o \ - pmemalign.o \ - puts.o \ - qsort.o \ - realloc.o \ - rewind.o \ - sleep.o \ - strftime.o \ - strtok.o \ - strtol.o \ - strtoul.o \ - strxfrm.o \ - system.o \ - timezone.o - -# From assembly source-files -S_OBJS = _cwd.o \ - _environ.o \ - _fdesc.o \ - _file.o \ - _fopen.o \ - _heap.o \ - _heapadd.o \ - _heapblocksize.o \ - _heapmaxavail.o \ - _heapmemavail.o \ - _oserror.o \ - _printf.o \ - _seterrno.o \ - _swap.o \ - _sys.o \ - abs.o \ - atexit.o \ - atoi.o \ - calloc.o \ - cc65_idiv32by16r16.o \ - cc65_imul16x16r32.o \ - cc65_sincos.o \ - cc65_udiv32by16r16.o \ - cc65_umul16x16r32.o \ - cc65_umul16x8r32.o \ - chdir.o \ - copydata.o \ - creat.o \ - ctime.o \ - divt.o \ - errno.o \ - fclose.o \ - fmisc.o \ - fopen.o \ - fprintf.o \ - fread.o \ - free.o \ - fscanf.o \ - fwrite.o \ - getcpu.o \ - getcwd.o \ - getenv.o \ - interrupt.o \ - isalnum.o \ - isalpha.o \ - isblank.o \ - iscntrl.o \ - isdigit.o \ - isgraph.o \ - islower.o \ - isprint.o \ - ispunct.o \ - isspace.o \ - isupper.o \ - isxdigit.o \ - itoa.o \ - labs.o \ - longjmp.o \ - ltoa.o \ - malloc.o \ - memchr.o \ - memcmp.o \ - memcpy.o \ - memmove.o \ - memset.o \ - mkdir.o \ - modfree.o \ - modload.o \ - printf.o \ - putchar.o \ - putenv.o \ - rand.o \ - raise.o \ - remove.o \ - rename.o \ - rmdir.o \ - scanf.o \ - searchenv.o \ - setjmp.o \ - signal.o \ - sigtable.o \ - snprintf.o \ - sprintf.o \ - sscanf.o \ - strcat.o \ - strchr.o \ - strcmp.o \ - strcoll.o \ - strcpy.o \ - strcspn.o \ - strdup.o \ - strerror.o \ - stricmp.o \ - strlen.o \ - strlower.o \ - strncat.o \ - strncmp.o \ - strncpy.o \ - strnicmp.o \ - stroserr.o \ - strpbrk.o \ - strrchr.o \ - strspn.o \ - strstr.o \ - strtoimax.o \ - strtoumax.o \ - strupper.o \ - time.o \ - tolower.o \ - toupper.o \ - uname.o \ - ungetc.o \ - unlink.o \ - utscopy.o \ - vfprintf.o \ - vfscanf.o \ - vprintf.o \ - vscanf.o \ - vsnprintf.o \ - vsprintf.o \ - vsscanf.o \ - zerobss.o - - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @$(RM) *~ *.lst - @$(RM) $(C_OBJS:.o=.s) - @$(RM) $(C_OBJS) - @$(RM) $(S_OBJS) - -zap: clean - diff --git a/libsrc/conio/Makefile b/libsrc/conio/Makefile deleted file mode 100644 index 7a3fa77e2..000000000 --- a/libsrc/conio/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -*- makefile -*- -# -# makefile for CC65's console library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Rules to help us see what code the compiler and assembler make. - -#%.s : %.c -# @$(CC) $(CFLAGS) -S $< - -%.lst : %.s - @$(AS) $(AFLAGS) -l -o /dev/null $< - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _cursor.o \ - cprintf.o \ - cputhex.o \ - cputs.o \ - cscanf.o \ - cursor.o \ - scrsize.o \ - vcprintf.o \ - vcscanf.o - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) - -clean: - @$(RM) *~ *.lst $(OBJS) - -zap: clean - diff --git a/libsrc/dbg/Makefile b/libsrc/dbg/Makefile deleted file mode 100644 index 13ca1a17b..000000000 --- a/libsrc/dbg/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -g -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS = dbg.o - -S_OBJS = asmtab.o dbgdasm.o dbgdump.o dbgisram.o dbgsupp.o - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @$(RM) *~ $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) - -zap: clean - diff --git a/libsrc/em/Makefile b/libsrc/em/Makefile deleted file mode 100644 index f702a337c..000000000 --- a/libsrc/em/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Makefile for the extended memory library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -g -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS = - -S_OBJS = em-kernel.o \ - em_commit.o \ - em_copyto.o \ - em_copyfrom.o \ - em_load.o \ - em_map.o \ - em_pagecount.o \ - em_unload.o \ - em_use.o - - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @$(RM) *~ $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) - -zap: clean - diff --git a/libsrc/geos-apple/Makefile b/libsrc/geos-apple/Makefile deleted file mode 100644 index 0780f69a8..000000000 --- a/libsrc/geos-apple/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = geos-apple2 - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I. -I../geos-common -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) -o $(notdir $(*).s) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Directories - -DIRS = disk - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = - -JOYS = - -MOUS = - -SERS = - -TGIS = - -#-------------------------------------------------------------------------- -# Directives - -include $(addsuffix /Makefile, $(DIRS)) -vpath %.c $(DIRS) -vpath %.s $(DIRS) - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) $(EMDS:.emd=.o) $(JOYS:.joy=.o) $(MOUS:.mou=.o) $(SERS:.ser=.o) $(TGIS:.tgi=.o) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/geos-apple/Makefile.inc b/libsrc/geos-apple/Makefile.inc new file mode 100644 index 000000000..28238aa29 --- /dev/null +++ b/libsrc/geos-apple/Makefile.inc @@ -0,0 +1 @@ +CFLAGS += -Wa -Igeos-apple,-Igeos-common diff --git a/libsrc/geos-apple/disk/Makefile b/libsrc/geos-apple/disk/Makefile deleted file mode 100644 index a4bd0546d..000000000 --- a/libsrc/geos-apple/disk/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += enterturbo.o \ - exitturbo.o \ - purgeturbo.o diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile deleted file mode 100644 index c2a2720b5..000000000 --- a/libsrc/geos-cbm/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = geos-cbm - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I. -I../geos-common -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) -o $(notdir $(*).s) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Directories - -DIRS = disk \ - drivers \ - file \ - memory \ - system - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = geos-vdc.emd - -JOYS = geos-stdjoy.joy - -MOUS = - -SERS = - -TGIS = geos-tgi.tgi - -#-------------------------------------------------------------------------- -# Directives - -include $(addsuffix /Makefile, $(DIRS)) -vpath %.c $(DIRS) -vpath %.s $(DIRS) - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) $(EMDS:.emd=.o) $(JOYS:.joy=.o) $(MOUS:.mou=.o) $(SERS:.ser=.o) $(TGIS:.tgi=.o) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/geos-cbm/Makefile.inc b/libsrc/geos-cbm/Makefile.inc new file mode 100644 index 000000000..53ce4804c --- /dev/null +++ b/libsrc/geos-cbm/Makefile.inc @@ -0,0 +1 @@ +CFLAGS += -Wa -Igeos-cbm,-Igeos-common diff --git a/libsrc/geos-cbm/disk/Makefile b/libsrc/geos-cbm/disk/Makefile deleted file mode 100644 index f027b355e..000000000 --- a/libsrc/geos-cbm/disk/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += changediskdevice.o \ - chkdkgeos.o \ - dio_cts.o \ - dio_openclose.o \ - dio_params.o \ - dio_qcount.o \ - dio_qsize.o \ - dio_read.o \ - dio_stc.o \ - dio_write.o \ - dio_writev.o \ - enterturbo.o \ - exitturbo.o \ - findbambit.o \ - newdisk.o \ - purgeturbo.o \ - readblock.o \ - readbuff.o \ - setgeosdisk.o \ - writeblock.o \ - writebuff.o \ - verwriteblock.o diff --git a/libsrc/geos-cbm/drivers/Makefile b/libsrc/geos-cbm/drivers/Makefile deleted file mode 100644 index 96af4145b..000000000 --- a/libsrc/geos-cbm/drivers/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += joy_stddrv.o \ - tgi_colors.o \ - tgi_stddrv.o diff --git a/libsrc/geos-cbm/drivers/geos-vdc.s b/libsrc/geos-cbm/emd/geos-vdc.s similarity index 100% rename from libsrc/geos-cbm/drivers/geos-vdc.s rename to libsrc/geos-cbm/emd/geos-vdc.s diff --git a/libsrc/geos-cbm/file/Makefile b/libsrc/geos-cbm/file/Makefile deleted file mode 100644 index a92db605e..000000000 --- a/libsrc/geos-cbm/file/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += followchain.o diff --git a/libsrc/geos-cbm/drivers/geos-stdjoy.s b/libsrc/geos-cbm/joy/geos-stdjoy.s similarity index 100% rename from libsrc/geos-cbm/drivers/geos-stdjoy.s rename to libsrc/geos-cbm/joy/geos-stdjoy.s diff --git a/libsrc/geos-cbm/memory/Makefile b/libsrc/geos-cbm/memory/Makefile deleted file mode 100644 index 6b9078a34..000000000 --- a/libsrc/geos-cbm/memory/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += fetchram.o \ - reuregs.o \ - stashram.o \ - swapram.o \ - verifyram.o diff --git a/libsrc/geos-cbm/system/Makefile b/libsrc/geos-cbm/system/Makefile deleted file mode 100644 index a0cea1497..000000000 --- a/libsrc/geos-cbm/system/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += get_ostype.o \ - getserialnumber.o \ - initdoneio.o \ - setdevice.o \ - tobasic.o diff --git a/libsrc/geos-cbm/drivers/geos-tgi.s b/libsrc/geos-cbm/tgi/geos-tgi.s similarity index 100% rename from libsrc/geos-cbm/drivers/geos-tgi.s rename to libsrc/geos-cbm/tgi/geos-tgi.s diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile deleted file mode 100644 index 70dd09a23..000000000 --- a/libsrc/geos-common/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = geos-cbm - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I. -I../$(SYS) -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) -o $(notdir $(*).s) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Directories - -DIRS = common \ - conio \ - dlgbox \ - disk \ - file \ - graph \ - memory \ - menuicon \ - mousesprite \ - process \ - runtime \ - system - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = - -JOYS = - -MOUS = #geos-stdmou.mou - -SERS = - -TGIS = - -#-------------------------------------------------------------------------- -# Directives - -include $(addsuffix /Makefile, $(DIRS)) -vpath %.c $(DIRS) -vpath %.s $(DIRS) - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) $(EMDS:.emd=.o) $(JOYS:.joy=.o) $(MOUS:.mou=.o) $(SERS:.ser=.o) $(TGIS:.tgi=.o) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/geos-common/common/Makefile b/libsrc/geos-common/common/Makefile deleted file mode 100644 index 096478d8d..000000000 --- a/libsrc/geos-common/common/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS += _afailed.o \ - _poserror.o \ - abort.o \ - perror.o \ - sleep.o - -S_OBJS += copydata.o \ - memcpy.o \ - memmove.o \ - memset.o \ - zerobss.o diff --git a/libsrc/geos-common/conio/Makefile b/libsrc/geos-common/conio/Makefile deleted file mode 100644 index 7f53de176..000000000 --- a/libsrc/geos-common/conio/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += _scrsize.o \ - cclear.o \ - cgetc.o \ - chline.o \ - clrscr.o \ - cputc.o \ - cvline.o \ - dummies.o \ - gotoxy.o \ - kbhit.o \ - where.o diff --git a/libsrc/geos-common/disk/Makefile b/libsrc/geos-common/disk/Makefile deleted file mode 100644 index ffb5175ea..000000000 --- a/libsrc/geos-common/disk/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += blkalloc.o \ - calcblksfree.o \ - freeblock.o \ - getblock.o \ - getdirhead.o \ - getptrcurdknm.o \ - gettrse.o \ - nxtblkalloc.o \ - opendisk.o \ - putblock.o \ - putdirhead.o \ - setnextfree.o \ No newline at end of file diff --git a/libsrc/geos-common/dlgbox/Makefile b/libsrc/geos-common/dlgbox/Makefile deleted file mode 100644 index cf24c8a32..000000000 --- a/libsrc/geos-common/dlgbox/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS += messagebox.o - -S_OBJS += dbget2lines.o \ - dlgboxgetstring.o \ - dlgboxfileselect.o \ - dlgboxok.o \ - dlgboxokcancel.o \ - dlgboxyesno.o \ - dodlgbox.o \ - rstrfrmdialogue.o diff --git a/libsrc/geos-common/drivers/Makefile b/libsrc/geos-common/drivers/Makefile deleted file mode 100644 index a706e22ba..000000000 --- a/libsrc/geos-common/drivers/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += fio_module.o \ - mcbdefault.o \ - mouse_stddrv.o diff --git a/libsrc/geos-common/file/Makefile b/libsrc/geos-common/file/Makefile deleted file mode 100644 index 8872c7e66..000000000 --- a/libsrc/geos-common/file/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += appendrecord.o \ - closerecordfile.o \ - deletefile.o \ - deleterecord.o \ - findfile.o \ - findftypes.o \ - freefile.o \ - get1stdirentry.o \ - getfhdrinfo.o \ - getfile.o \ - getnxtdirentry.o \ - insertrecord.o \ - nextrecord.o \ - openrecordfile.o \ - pointrecord.o \ - previousrecord.o \ - readbyte.o \ - readfile.o \ - readrecord.o \ - renamefile.o \ - savefile.o \ - sysremove.o \ - sysrename.o \ - updaterecordfile.o \ - writerecord.o \ No newline at end of file diff --git a/libsrc/geos-common/graph/Makefile b/libsrc/geos-common/graph/Makefile deleted file mode 100644 index fea69823a..000000000 --- a/libsrc/geos-common/graph/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += bitmapclip.o \ - bitmapregs.o \ - bitmapup.o \ - bitotherclip.o \ - drawline.o \ - drawpoint.o \ - framerectangle.o \ - getcharwidth.o \ - getintcharint.o \ - graphicsstring.o \ - hlineregs.o \ - horizontalline.o \ - imprintrectangle.o \ - initdrawwindow.o \ - invertline.o \ - invertrectangle.o \ - loadcharset.o \ - pointregs.o \ - put_char.o \ - putdecimal.o \ - putstring.o \ - recoverline.o \ - recoverrectangle.o \ - rectangle.o \ - setpattern.o \ - testpoint.o \ - usesystemfont.o \ - verticalline.o diff --git a/libsrc/geos-common/memory/Makefile b/libsrc/geos-common/memory/Makefile deleted file mode 100644 index 61585a539..000000000 --- a/libsrc/geos-common/memory/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += clearram.o \ - cmpfstring.o \ - cmpstring.o \ - copyfstring.o \ - copystring.o \ - crc.o \ - doublepop.o \ - doublespop.o \ - fillram.o \ - initram.o \ - movedata.o diff --git a/libsrc/geos-common/menuicon/Makefile b/libsrc/geos-common/menuicon/Makefile deleted file mode 100644 index bfa9a89fb..000000000 --- a/libsrc/geos-common/menuicon/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += doicons.o \ - domenu.o \ - dopreviousmenu.o \ - gotofirstmenu.o \ - recoverallmenus.o \ - recovermenu.o \ - redomenu.o diff --git a/libsrc/geos-common/mousesprite/Makefile b/libsrc/geos-common/mousesprite/Makefile deleted file mode 100644 index bf49424d3..000000000 --- a/libsrc/geos-common/mousesprite/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += clearmousemode.o \ - disablsprite.o \ - drawsprite.o \ - enablsprite.o \ - getnextchar.o \ - inittextprompt.o \ - ismseinregion.o \ - mouseoff.o \ - mouseup.o \ - possprite.o \ - promptoff.o \ - prompton.o \ - startmousemode.o \ No newline at end of file diff --git a/libsrc/geos-common/process/Makefile b/libsrc/geos-common/process/Makefile deleted file mode 100644 index de9130679..000000000 --- a/libsrc/geos-common/process/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += processblock.o \ - processfreeze.o \ - processinitrestartenable.o \ - processsleep.o diff --git a/libsrc/geos-common/runtime/Makefile b/libsrc/geos-common/runtime/Makefile deleted file mode 100644 index bcbcbb01c..000000000 --- a/libsrc/geos-common/runtime/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += call.o diff --git a/libsrc/geos-common/system/Makefile b/libsrc/geos-common/system/Makefile deleted file mode 100644 index d4aa0fdeb..000000000 --- a/libsrc/geos-common/system/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS += systime.o - -S_OBJS += callroutine.o \ - crt0.o \ - ctype.o \ - enterdesktop.o \ - extzp.o \ - firstinit.o \ - getrandom.o \ - mainargs.o \ - mainloop.o \ - oserrlist.o \ - oserror.o \ - panic.o \ - randomize.o \ - setoserror.o \ - sysuname.o diff --git a/libsrc/geos-cbm/drivers/joy_stddrv.s b/libsrc/geos-common/system/joy_stddrv.s similarity index 100% rename from libsrc/geos-cbm/drivers/joy_stddrv.s rename to libsrc/geos-common/system/joy_stddrv.s diff --git a/libsrc/geos-cbm/drivers/tgi_colors.s b/libsrc/geos-common/system/tgi_colors.s similarity index 100% rename from libsrc/geos-cbm/drivers/tgi_colors.s rename to libsrc/geos-common/system/tgi_colors.s diff --git a/libsrc/geos-cbm/drivers/tgi_stddrv.s b/libsrc/geos-common/system/tgi_stddrv.s similarity index 100% rename from libsrc/geos-cbm/drivers/tgi_stddrv.s rename to libsrc/geos-common/system/tgi_stddrv.s diff --git a/libsrc/joystick/Makefile b/libsrc/joystick/Makefile deleted file mode 100644 index 884ad06fd..000000000 --- a/libsrc/joystick/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Makefile for the joystick library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -g -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS = - -S_OBJS = joy-kernel.o \ - joy_read.o \ - joy_count.o \ - joy_load.o \ - joy_unload.o - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @$(RM) *~ $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) - -zap: clean - - diff --git a/libsrc/lynx/Makefile b/libsrc/lynx/Makefile deleted file mode 100644 index c901aba66..000000000 --- a/libsrc/lynx/Makefile +++ /dev/null @@ -1,139 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = lynx - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-mou.o: %.mou - @$(CO) -o $(*)-mou.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-mou.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o extzp.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = bllhdr.o \ - bootldr.o \ - cgetc.o \ - clock.o \ - crt0.o \ - ctype.o \ - defdir.o \ - eeprom.o \ - eeprom46.o \ - eeprom66.o \ - eeprom86.o \ - exec.o \ - exehdr.o \ - extzp.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - load.o \ - lseek.o \ - lynx-cart.o \ - lynx-snd.o \ - mainargs.o \ - open.o \ - oserror.o \ - read.o \ - sysuname.o \ - tgi_colors.o \ - tgi_stat_stddrv.o \ - tgi_stddrv.o \ - toascii.o \ - uploader.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(MOUS:.mou=-mou.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = - -JOYS = lynx-stdjoy.joy - -MOUS = - -SERS = lynx-comlynx.ser - -TGIS = lynx-160-102-16.tgi - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(MOUS:.mou=.o) $(MOUS:.mou=-mou.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/lynx/lynx-stdjoy.s b/libsrc/lynx/joy/lynx-stdjoy.s similarity index 98% rename from libsrc/lynx/lynx-stdjoy.s rename to libsrc/lynx/joy/lynx-stdjoy.s index a52d5cba6..3ebca7a85 100644 --- a/libsrc/lynx/lynx-stdjoy.s +++ b/libsrc/lynx/joy/lynx-stdjoy.s @@ -12,7 +12,6 @@ .include "joy-kernel.inc" .include "joy-error.inc" .include "lynx.inc" - .include "extzp.inc" .macpack generic diff --git a/libsrc/lynx/lynx-comlynx.s b/libsrc/lynx/ser/lynx-comlynx.s similarity index 100% rename from libsrc/lynx/lynx-comlynx.s rename to libsrc/lynx/ser/lynx-comlynx.s diff --git a/libsrc/lynx/lynx-160-102-16.s b/libsrc/lynx/tgi/lynx-160-102-16.s similarity index 99% rename from libsrc/lynx/lynx-160-102-16.s rename to libsrc/lynx/tgi/lynx-160-102-16.s index f5d9e2ece..0dd3338bf 100644 --- a/libsrc/lynx/lynx-160-102-16.s +++ b/libsrc/lynx/tgi/lynx-160-102-16.s @@ -8,7 +8,7 @@ ; .include "zeropage.inc" - .include "extzp.inc" + .include "../extzp.inc" .include "tgi-kernel.inc" .include "tgi-error.inc" diff --git a/libsrc/mouse/Makefile b/libsrc/mouse/Makefile deleted file mode 100644 index cc0deca33..000000000 --- a/libsrc/mouse/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Makefile for the mouse driver library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -g -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS = - -S_OBJS = mouse-kernel.o \ - mouse_buttons.o \ - mouse_getbox.o \ - mouse_geterrormsg.o \ - mouse_hide.o \ - mouse_info.o \ - mouse_ioctl.o \ - mouse_load.o \ - mouse_move.o \ - mouse_pos.o \ - mouse_setbox.o \ - mouse_show.o \ - mouse_unload.o - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @$(RM) *~ $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) - -zap: clean - diff --git a/libsrc/nes/Makefile b/libsrc/nes/Makefile deleted file mode 100644 index 78f48cac9..000000000 --- a/libsrc/nes/Makefile +++ /dev/null @@ -1,150 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = nes - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-mou.o: %.mou - @$(CO) -o $(*)-mou.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-mou.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.mou: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - cclear.o \ - chline.o \ - clock.o \ - clrscr.o \ - color.o \ - cputc.o \ - crt0.o \ - ctype.o \ - cvline.o \ - get_tv.o \ - gotox.o \ - gotoxy.o \ - gotoy.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - mainargs.o \ - ppu.o \ - ppubuf.o \ - randomize.o \ - revers.o \ - setcursor.o \ - sysuname.o \ - tgi_colors.o \ - tgi_stat_stddrv.o \ - tgi_stddrv.o \ - waitvblank.o \ - wherex.o \ - wherey.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(MOUS:.mou=-mou.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = - -JOYS = nes-stdjoy.joy - -MOUS = - -SERS = - -TGIS = nes-64-56-2.tgi - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) - -../runtime/popa.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -nes-64-56-2.tgi: nes-64-56-2.o \ - ../runtime/popa.o \ - ../runtime/zeropage.o \ - clrscr.o \ - cputc.o \ - get_tv.o \ - gotoxy.o \ - ppu.o \ - ppubuf.o \ - setcursor.o - @$(LD) -o $@ -t module $^ - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(MOUS:.mou=.o) $(MOUS:.mou=-mou.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(MOUS) $(SERS) $(TGIS) diff --git a/libsrc/nes/Makefile.inc b/libsrc/nes/Makefile.inc new file mode 100644 index 000000000..868b0628b --- /dev/null +++ b/libsrc/nes/Makefile.inc @@ -0,0 +1,8 @@ +../tgi/nes-64-56-2.tgi: ../wrk/nes/clrscr.o \ + ../wrk/nes/cputc.o \ + ../wrk/nes/get_tv.o \ + ../wrk/nes/gotoxy.o \ + ../wrk/nes/popa.o \ + ../wrk/nes/ppu.o \ + ../wrk/nes/ppubuf.o \ + ../wrk/nes/setcursor.o diff --git a/libsrc/nes/nes-stdjoy.s b/libsrc/nes/joy/nes-stdjoy.s similarity index 100% rename from libsrc/nes/nes-stdjoy.s rename to libsrc/nes/joy/nes-stdjoy.s diff --git a/libsrc/nes/nes-64-56-2.s b/libsrc/nes/tgi/nes-64-56-2.s similarity index 99% rename from libsrc/nes/nes-64-56-2.s rename to libsrc/nes/tgi/nes-64-56-2.s index 5b6ae404b..f41e63d88 100644 --- a/libsrc/nes/nes-64-56-2.s +++ b/libsrc/nes/tgi/nes-64-56-2.s @@ -491,4 +491,4 @@ CALC: lda xres ; ------------------------------------------------------------------------ -.include "../tgi/tgidrv_line.inc" +.include "../../tgi/tgidrv_line.inc" diff --git a/libsrc/pet/Makefile b/libsrc/pet/Makefile deleted file mode 100644 index 4243d1942..000000000 --- a/libsrc/pet/Makefile +++ /dev/null @@ -1,115 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = pet - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - break.o \ - cgetc.o \ - checkst.o \ - clrscr.o \ - color.o \ - conio.o \ - cputc.o \ - crt0.o \ - devnum.o \ - get_tv.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - kbsout.o \ - kchkin.o \ - kckout.o \ - kclose.o \ - kernal.o \ - kopen.o \ - kplot.o \ - krdtim.o \ - kreadst.o \ - ksetlfs.o \ - ksetnam.o \ - mainargs.o \ - randomize.o \ - revers.o \ - status.o \ - sysuname.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(TGIS:.tgi=-tgi.o) - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = - -JOYS = pet-ptvjoy.joy pet-stdjoy.joy - -TGIS = - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(TGIS) diff --git a/libsrc/pet/pet-ptvjoy.s b/libsrc/pet/joy/pet-ptvjoy.s similarity index 100% rename from libsrc/pet/pet-ptvjoy.s rename to libsrc/pet/joy/pet-ptvjoy.s diff --git a/libsrc/pet/pet-stdjoy.s b/libsrc/pet/joy/pet-stdjoy.s similarity index 100% rename from libsrc/pet/pet-stdjoy.s rename to libsrc/pet/joy/pet-stdjoy.s diff --git a/libsrc/plus4/Makefile b/libsrc/plus4/Makefile deleted file mode 100644 index eeff3b912..000000000 --- a/libsrc/plus4/Makefile +++ /dev/null @@ -1,138 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = c16 - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-ser.o: %.ser - @$(CO) -o $(*)-ser.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-ser.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.ser: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - break.o \ - cgetc.o \ - clrscr.o \ - color.o \ - conio.o \ - cputc.o \ - crt0.o \ - devnum.o \ - get_tv.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kacptr.o \ - kbasin.o \ - kbhit.o \ - kbsout.o \ - kchkin.o \ - kciout.o \ - kckout.o \ - kclall.o \ - kclose.o \ - kclrch.o \ - kiobase.o \ - klisten.o \ - kload.o \ - kopen.o \ - kplot.o \ - krdtim.o \ - kreadst.o \ - ksave.o \ - ksetlfs.o \ - ksetnam.o \ - ksettim.o \ - ktalk.o \ - kunlsn.o \ - kuntlk.o \ - mainargs.o \ - randomize.o \ - revers.o \ - status.o \ - systime.o \ - sysuname.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(SERS:.ser=-ser.o) \ - $(TGIS:.tgi=-tgi.o) - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = - -JOYS = plus4-stdjoy.joy - -SERS = plus4-stdser.ser - -TGIS = - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(SERS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(SERS:.ser=.o) $(SERS:.ser=-ser.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(SERS) $(TGIS) diff --git a/libsrc/plus4/plus4-stdjoy.s b/libsrc/plus4/joy/plus4-stdjoy.s similarity index 100% rename from libsrc/plus4/plus4-stdjoy.s rename to libsrc/plus4/joy/plus4-stdjoy.s diff --git a/libsrc/plus4/plus4-stdser.s b/libsrc/plus4/ser/plus4-stdser.s similarity index 100% rename from libsrc/plus4/plus4-stdser.s rename to libsrc/plus4/ser/plus4-stdser.s diff --git a/libsrc/runtime/Makefile b/libsrc/runtime/Makefile deleted file mode 100644 index f661f39a1..000000000 --- a/libsrc/runtime/Makefile +++ /dev/null @@ -1,240 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -.c.s: - @$(CC) $(CFLAGS) $< - -.s.o: - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -OBJS = add.o \ - addeqsp.o \ - addysp.o \ - along.o \ - and.o \ - aslax1.o \ - aslax2.o \ - aslax3.o \ - aslax4.o \ - asleax1.o \ - asleax2.o \ - asleax3.o \ - asleax4.o \ - asr.o \ - asrax1.o \ - asrax2.o \ - asrax3.o \ - asrax4.o \ - asreax1.o \ - asreax2.o \ - asreax3.o \ - asreax4.o \ - axlong.o \ - bneg.o \ - bpushbsp.o \ - call.o \ - callirq.o \ - callmain.o \ - compl.o \ - condes.o \ - decax1.o \ - decax2.o \ - decax3.o \ - decax4.o \ - decax5.o \ - decax6.o \ - decax7.o \ - decax8.o \ - decaxy.o \ - decsp1.o \ - decsp2.o \ - decsp3.o \ - decsp4.o \ - decsp5.o \ - decsp6.o \ - decsp7.o \ - decsp8.o \ - div.o \ - enter.o \ - eq.o \ - ge.o \ - gt.o \ - icmp.o \ - idiv32by16r16.o \ - imul16x16r32.o \ - incax1.o \ - incax2.o \ - incax3.o \ - incax5.o \ - incax6.o \ - incax7.o \ - incax8.o \ - incaxy.o \ - incsp1.o \ - incsp2.o \ - incsp3.o \ - incsp4.o \ - incsp5.o \ - incsp6.o \ - incsp7.o \ - incsp8.o \ - jmpvec.o \ - ladd.o \ - laddeq.o \ - laddeqsp.o \ - land.o \ - lasr.o \ - lbneg.o \ - lcmp.o \ - lcompl.o \ - ldai.o \ - ldau0sp.o \ - ldaui.o \ - ldauisp.o \ - ldaxi.o \ - ldaxsp.o \ - ldeaxi.o \ - ldeaxysp.o \ - ldec.o \ - ldiv.o \ - le.o \ - leaaxsp.o \ - leave.o \ - leq.o \ - lge.o \ - lgt.o \ - linc.o \ - lle.o \ - llt.o \ - lmod.o \ - lmul.o \ - lne.o \ - lneg.o \ - lor.o \ - lpop.o \ - lpush.o \ - lrsub.o \ - lsave.o \ - lshelp.o \ - lshl.o \ - lshr.o \ - lsub.o \ - lsubeq.o \ - lsubeqsp.o \ - lt.o \ - ltest.o \ - ludiv.o \ - luge.o \ - lugt.o \ - lule.o \ - lult.o \ - lumod.o \ - lxor.o \ - makebool.o \ - mod.o \ - mul.o \ - mul8.o \ - mulax3.o \ - mulax5.o \ - mulax6.o \ - mulax7.o \ - mulax9.o \ - mulax10.o \ - ne.o \ - neg.o \ - or.o \ - popa.o \ - popsreg.o \ - push1.o \ - push2.o \ - push3.o \ - push4.o \ - push5.o \ - push6.o \ - push7.o \ - pusha.o \ - pushaff.o \ - pushax.o \ - pushb.o \ - pushbsp.o \ - pushc0.o \ - pushc1.o \ - pushc2.o \ - pushlysp.o \ - pushw.o \ - pushwsp.o \ - regswap.o \ - regswap1.o \ - regswap2.o \ - return0.o \ - return1.o \ - rsub.o \ - shelp.o \ - shl.o \ - shr.o \ - shrax1.o \ - shrax2.o \ - shrax3.o \ - shrax4.o \ - shreax1.o \ - shreax2.o \ - shreax3.o \ - shreax4.o \ - staspidx.o \ - staxsp.o \ - staxspi.o \ - steaxsp.o \ - steaxspi.o \ - stkchk.o \ - sub.o \ - subeqsp.o \ - subysp.o \ - swap.o \ - tosint.o \ - toslong.o \ - udiv.o \ - uge.o \ - ugt.o \ - ule.o \ - ult.o \ - udiv32by16r16.o \ - umod.o \ - umul16x16r32.o \ - umul8x16r24.o \ - umul8x8r16.o \ - xor.o \ - zeropage.o - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) - -clean: - @$(RM) *~ $(COBJS:.o=.s) $(OBJS) - -zap: clean - diff --git a/libsrc/serial/Makefile b/libsrc/serial/Makefile deleted file mode 100644 index b6b3c946d..000000000 --- a/libsrc/serial/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Makefile for the serial driver API -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -g -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS = - -S_OBJS = ser-kernel.o \ - ser_close.o \ - ser_get.o \ - ser_ioctl.o \ - ser_load.o \ - ser_open.o \ - ser_put.o \ - ser_status.o \ - ser_unload.o - - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @$(RM) *~ $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) - -zap: clean - diff --git a/libsrc/supervision/Makefile b/libsrc/supervision/Makefile deleted file mode 100644 index 9db0ee731..000000000 --- a/libsrc/supervision/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# cc65 makefile for the supervision specific modules -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = supervision - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS= - -S_OBJS= crt0.o \ - ctype.o - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @$(RM) $(C_OBJS:.c=.s) $(C_OBJS) $(S_OBJS) - -zap: clean diff --git a/libsrc/tgi/Makefile b/libsrc/tgi/Makefile deleted file mode 100644 index 086f98c56..000000000 --- a/libsrc/tgi/Makefile +++ /dev/null @@ -1,99 +0,0 @@ -# -# Makefile for the TGI graphics kernel -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -g -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS = tgi_arc.o \ - tgi_load_vectorfont.o \ - tgi_pieslice.o - -S_OBJS = tgi-kernel.o \ - tgi_bar.o \ - tgi_circle.o \ - tgi_clear.o \ - tgi_clippedline.o \ - tgi_curtoxy.o \ - tgi_done.o \ - tgi_ellipse.o \ - tgi_free_vectorfont.o \ - tgi_getaspectratio.o \ - tgi_getcolor.o \ - tgi_getcolorcount.o \ - tgi_getdefpalette.o \ - tgi_geterror.o \ - tgi_geterrormsg.o \ - tgi_getmaxcolor.o \ - tgi_getmaxx.o \ - tgi_getmaxy.o \ - tgi_getpagecount.o \ - tgi_getpalette.o \ - tgi_getpixel.o \ - tgi_getset.o \ - tgi_gettextheight.o \ - tgi_gettextwidth.o \ - tgi_getxres.o \ - tgi_getyres.o \ - tgi_gotoxy.o \ - tgi_imulround.o \ - tgi_init.o \ - tgi_install_vectorfont.o\ - tgi_ioctl.o \ - tgi_line.o \ - tgi_linepop.o \ - tgi_lineto.o \ - tgi_load.o \ - tgi_outcode.o \ - tgi_outtext.o \ - tgi_outtextxy.o \ - tgi_popxy.o \ - tgi_popxy2.o \ - tgi_setaspectratio.o \ - tgi_setcolor.o \ - tgi_setdrawpage.o \ - tgi_setpalette.o \ - tgi_setpixel.o \ - tgi_settextdir.o \ - tgi_settextstyle.o \ - tgi_setviewpage.o \ - tgi_unload.o \ - tgi_vectorchar.o - - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @$(RM) *~ $(C_OBJS:.o=.s) $(C_OBJS) $(S_OBJS) - -zap: clean - diff --git a/libsrc/vic20/Makefile b/libsrc/vic20/Makefile deleted file mode 100644 index 2e9e88ef4..000000000 --- a/libsrc/vic20/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -# -# makefile for CC65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = vic20 - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -CO = ../../src/co65/co65 -LD = ../../src/ld65/ld65 - -AFLAGS=-t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS=-Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -%-emd.o: %.emd - @$(CO) -o $(*)-emd.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-emd.s - -%-joy.o: %.joy - @$(CO) -o $(*)-joy.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-joy.s - -%-tgi.o: %.tgi - @$(CO) -o $(*)-tgi.s --code-label _$(subst -,_,$(*)) $< - @$(AS) -o $@ $(AFLAGS) $(*)-tgi.s - -%.emd: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.joy: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -%.tgi: %.o ../runtime/zeropage.o - @$(LD) -o $@ -t module $^ - -#-------------------------------------------------------------------------- -# Object files - -OBJS = _scrsize.o \ - break.o \ - crt0.o \ - cgetc.o \ - clrscr.o \ - color.o \ - conio.o \ - cputc.o \ - devnum.o \ - get_tv.o \ - irq.o \ - joy_stat_stddrv.o \ - joy_stddrv.o \ - kbhit.o \ - kernal.o \ - kplot.o \ - mainargs.o \ - randomize.o \ - revers.o \ - status.o \ - sysuname.o \ - $(EMDS:.emd=-emd.o) \ - $(JOYS:.joy=-joy.o) \ - $(TGIS:.tgi=-tgi.o) - -#-------------------------------------------------------------------------- -# Drivers - -EMDS = - -JOYS = vic20-stdjoy.joy vic20-ptvjoy.joy - -TGIS = - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(OBJS) $(EMDS) $(JOYS) $(TGIS) - -../runtime/zeropage.o: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: - @$(RM) $(OBJS) \ - $(EMDS:.emd=.o) $(EMDS:.emd=-emd.s) \ - $(JOYS:.joy=.o) $(JOYS:.joy=-joy.s) \ - $(TGIS:.tgi=.o) $(TGIS:.tgi=-tgi.s) - -zap: clean - @$(RM) $(EMDS) $(JOYS) $(TGIS) diff --git a/libsrc/vic20/vic20-ptvjoy.s b/libsrc/vic20/joy/vic20-ptvjoy.s similarity index 100% rename from libsrc/vic20/vic20-ptvjoy.s rename to libsrc/vic20/joy/vic20-ptvjoy.s diff --git a/libsrc/vic20/vic20-stdjoy.s b/libsrc/vic20/joy/vic20-stdjoy.s similarity index 100% rename from libsrc/vic20/vic20-stdjoy.s rename to libsrc/vic20/joy/vic20-stdjoy.s diff --git a/libsrc/zlib/Makefile b/libsrc/zlib/Makefile deleted file mode 100644 index d00a1709c..000000000 --- a/libsrc/zlib/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Makefile for the zlib subdirectory of the cc65 runtime library -# - -.SUFFIXES: .o .s .c - -#-------------------------------------------------------------------------- -# Programs and flags - -SYS = none - -AS = ../../src/ca65/ca65 -CC = ../../src/cc65/cc65 -LD = ../../src/ld65/ld65 - -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc -CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include - -#-------------------------------------------------------------------------- -# Rules - -%.o: %.c - @$(CC) $(CFLAGS) $< - @$(AS) -g -o $@ $(AFLAGS) $(*).s - -%.o: %.s - @$(AS) -g -o $@ $(AFLAGS) $< - -#-------------------------------------------------------------------------- -# Object files - -C_OBJS = uncompress.o - - -S_OBJS = adler32.o \ - crc32.o \ - inflatemem.o - - -#-------------------------------------------------------------------------- -# Targets - -.PHONY: all clean zap - -all: $(C_OBJS) $(S_OBJS) - -clean: - @rm -f *~ - @rm -f $(C_OBJS:.o=.s) - @rm -f $(C_OBJS) - @rm -f $(S_OBJS) - -zap: clean -