X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libsrc%2FMakefile;h=e21d85d77d46e088622f34b60145919e82d8f70f;hb=7357b44104017916ec02600fdb15ea41df6198c0;hp=8fb21da0ee5b8e4c9c35b384007902dd94bb582a;hpb=feae688346d03cbd571fb945b43e5671ad3cda8a;p=cc65 diff --git a/libsrc/Makefile b/libsrc/Makefile index 8fb21da0e..e21d85d77 100644 --- a/libsrc/Makefile +++ b/libsrc/Makefile @@ -15,18 +15,18 @@ LD = ../../src/ld65/ld65 # List of all targets ALLTARGETS = apple2 \ apple2enh \ - atari \ - atmos \ + atari \ + atmos \ c16 \ - c128 \ - c64 \ - cbm510 \ - cbm610 \ - geos \ + c128 \ + c64 \ + cbm510 \ + cbm610 \ + geos \ lynx \ nes \ - pet \ - plus4 \ + pet \ + plus4 \ supervision \ vic20 @@ -43,53 +43,76 @@ all: apple2lib: for i in apple2 common runtime conio dbg em joystick mouse serial tgi zlib; do \ - $(MAKE) SYS=apple2 -C $$i || exit 1; \ + $(MAKE) SYS=apple2 -C $$i || exit 1; \ $(AR) a apple2.lib $$i/*.o;\ done - mv apple2/crt0.o apple2.o cp apple2/apple2-auxmem.emd a2.auxmem.emd cp apple2/apple2-stdjoy.joy a2.stdjoy.joy cp apple2/apple2-stdmou.mou a2.stdmou.mou cp apple2/apple2-ssc.ser a2.ssc.ser cp apple2/apple2-280-192-8.tgi a2.hi.tgi cp apple2/apple2-40-48-16.tgi a2.lo.tgi + if [ -d apple2/extra ]; then \ + for i in apple2/extra/*.o; do \ + cp $$i apple2-`basename $$i`; \ + done \ + fi \ #----------------------------------------------------------------------------- -# Apple //e +# enhanced Apple //e apple2enhlib: for i in apple2enh common runtime conio dbg em joystick mouse serial tgi zlib; do \ $(MAKE) SYS=apple2enh -C $$i || exit 1; \ $(AR) a apple2enh.lib $$i/*.o;\ done - mv apple2enh/crt0.o apple2enh.o cp apple2enh/apple2-auxmem.emd a2e.auxmem.emd cp apple2enh/apple2-stdjoy.joy a2e.stdjoy.joy cp apple2enh/apple2-stdmou.mou a2e.stdmou.mou cp apple2enh/apple2-ssc.ser a2e.ssc.ser cp apple2enh/apple2-280-192-8.tgi a2e.hi.tgi cp apple2enh/apple2-40-48-16.tgi a2e.lo.tgi + if [ -d apple2enh/extra ]; then \ + for i in apple2enh/extra/*.o; do \ + cp $$i apple2enh-`basename $$i`; \ + done \ + fi \ #----------------------------------------------------------------------------- # Atari atarilib: for i in atari common runtime conio dbg em joystick tgi zlib; do \ - $(MAKE) SYS=atari -C $$i || exit 1; \ + $(MAKE) SYS=atari -C $$i || exit 1; \ $(AR) a atari.lib $$i/*.o;\ done - mv atari/crt0.o atari.o cp atari/atari-stdjoy.joy ataristd.joy + cp atari/atari-multijoy.joy atarimj8.joy + cp atari/atari-10.tgi atari10.tgi + cp atari/atari-10p2.tgi atr10p2.tgi + cp atari/atari-11.tgi atari11.tgi + cp atari/atari-14.tgi atari14.tgi + cp atari/atari-15.tgi atari15.tgi + cp atari/atari-15p2.tgi atr15p2.tgi + cp atari/atari-3.tgi atari3.tgi + cp atari/atari-4.tgi atari4.tgi + cp atari/atari-5.tgi atari5.tgi + cp atari/atari-6.tgi atari6.tgi + cp atari/atari-7.tgi atari7.tgi + cp atari/atari-8.tgi atari8.tgi + cp atari/atari-8p2.tgi atr8p2.tgi + cp atari/atari-9.tgi atari9.tgi + cp atari/atari-9p2.tgi atr9p2.tgi + #----------------------------------------------------------------------------- # Oric Atmos atmoslib: for i in atmos common conio runtime em joystick tgi zlib; do \ - $(MAKE) SYS=atmos -C $$i || exit 1; \ + $(MAKE) SYS=atmos -C $$i || exit 1; \ $(AR) a atmos.lib $$i/*.o;\ done - mv atmos/crt0.o atmos.o cp atmos/*.tgi . #----------------------------------------------------------------------------- @@ -97,10 +120,9 @@ atmoslib: c16lib: for i in c16 cbm common runtime conio dbg em joystick tgi zlib; do \ - $(MAKE) SYS=c16 -C $$i || exit 1; \ + $(MAKE) SYS=c16 -C $$i || exit 1; \ $(AR) a c16.lib $$i/*.o;\ done - mv c16/crt0.o c16.o cp c16/*.joy . cp c16/*.emd . @@ -112,11 +134,11 @@ c64lib: $(MAKE) SYS=c64 -C $$i || exit 1; \ $(AR) a c64.lib $$i/*.o;\ done - mv c64/crt0.o c64.o cp c64/*.emd . cp c64/*.joy . cp c64/c64-1351.mou . cp c64/c64-joymouse.mou c64-joy.mou + cp c64/c64-potmouse.mou c64-pot.mou cp c64/*.ser . cp c64/c64-320-200-2.tgi c64-hi.tgi @@ -128,11 +150,11 @@ c128lib: $(MAKE) SYS=c128 -C $$i || exit 1; \ $(AR) a c128.lib $$i/*.o;\ done - mv c128/crt0.o c128.o cp c128/*.emd . cp c128/*.joy . cp c128/c128-1351.mou . cp c128/c128-joymouse.mou c128-joy.mou + cp c128/c128-potmouse.mou c128-pot.mou cp c128/*.ser . cp c128/c128-640-200-2.tgi c128-vdc.tgi cp c128/c128-640-480-2.tgi c128-vdc2.tgi @@ -145,7 +167,6 @@ cbm510lib: $(MAKE) SYS=cbm510 -C $$i || exit 1; \ $(AR) a cbm510.lib $$i/*.o;\ done - mv cbm510/crt0.o cbm510.o cp cbm510/*.emd . cp cbm510/cbm510-stdjoy.joy cbm510-std.joy cp cbm510/cbm510-stdser.ser cbm510-std.ser @@ -158,7 +179,6 @@ cbm610lib: $(MAKE) SYS=cbm610 -C $$i || exit 1; \ $(AR) a cbm610.lib $$i/*.o;\ done - mv cbm610/crt0.o cbm610.o cp cbm610/*.emd . cp cbm610/cbm610-stdser.ser cbm610-std.ser @@ -169,7 +189,7 @@ geoslib: CC=../$(CC) \ AS=../$(AS) \ AR=../$(AR) \ - LD=../$(LD) \ + LD=../$(LD) \ AFLAGS="-t geos -I../../../asminc" \ CFLAGS="-Osir -g -T -t geos --forget-inc-paths -I. -I../../../include" \ $(MAKE) -C geos || exit 1 @@ -197,13 +217,13 @@ geoslib: # Lynx lynxlib: - for i in lynx common conio runtime em joystick tgi zlib; do \ + for i in lynx common conio runtime em joystick serial tgi zlib; do \ $(MAKE) SYS=lynx -C $$i || exit 1; \ $(AR) a lynx.lib $$i/*.o;\ done - mv lynx/crt0.o lynx.o cp lynx/*.joy . cp lynx/*.tgi . + cp lynx/*.ser . #----------------------------------------------------------------------------- # NES @@ -213,7 +233,6 @@ neslib: $(MAKE) SYS=nes -C $$i || exit 1; \ $(AR) a nes.lib $$i/*.o;\ done - mv nes/crt0.o nes.o cp nes/*.joy . #----------------------------------------------------------------------------- @@ -224,7 +243,6 @@ petlib: $(MAKE) SYS=pet -C $$i || exit 1; \ $(AR) a pet.lib $$i/*.o;\ done - mv pet/crt0.o pet.o cp pet/*.joy . #----------------------------------------------------------------------------- @@ -235,7 +253,6 @@ plus4lib: $(MAKE) SYS=plus4 -C $$i || exit 1; \ $(AR) a plus4.lib $$i/*.o;\ done - mv plus4/crt0.o plus4.o cp plus4/*.joy . cp plus4/*.ser . @@ -247,7 +264,6 @@ supervisionlib: $(MAKE) SYS=supervision -C $$i || exit 1; \ $(AR) a supervision.lib $$i/*.o;\ done - mv supervision/crt0.o supervision.o #----------------------------------------------------------------------------- # Vic20 @@ -257,7 +273,6 @@ vic20lib: $(MAKE) SYS=vic20 -C $$i || exit 1; \ $(AR) a vic20.lib $$i/*.o;\ done - mv vic20/crt0.o vic20.o cp vic20/*.joy . #----------------------------------------------------------------------------- @@ -266,7 +281,7 @@ vic20lib: .PHONY: clean clean: @for i in cbm common conio dbg em joystick mouse runtime serial tgi zlib $(ALLTARGETS); do\ - $(MAKE) -C $$i clean; \ + $(MAKE) -C $$i clean; \ done .PHONY: zap