Fixed a bug

[cc65] / libsrc / Makefile

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 4cf826026b4102dfb82028189f4ec776f5ad97c5..f0ae5e46c7201b6c7ef40581c186cf46621a0c62 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -4,21 +4,25 @@
 
 .SUFFIXES: .o .obj .s .c
 
-# Defines for executables. The first two are passed to the submakes and are
-# relative to the subdirectories, the last one is used directly.
-CC = ../../src/cc65/cc65
-AS = ../../src/ca65/ca65
+# Defines for executables. AR is used within this makefile, the others are
+# passed to the submakes and contain paths relative to the subdirectories
+# handled by the make subprocesses.
 AR = ../src/ar65/ar65
+AS = ../../src/ca65/ca65
+CC = ../../src/cc65/cc65
+LD = ../../src/ld65/ld65
 
 # List of all targets
 ALLTARGETS =   apple2lib       \
-               atarilib        \
-               c64lib          \
-               c128lib         \
+               atarilib        \
+               atmoslib        \
+               vic20lib        \
+               c64lib          \
+               c128lib         \
                cbm510lib       \
                cbm610lib       \
-               geoslib         \
-               petlib          \
+               geoslib         \
+               petlib          \
                plus4lib
 
 #-----------------------------------------------------------------------------
@@ -36,7 +40,7 @@ apple2lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t apple2 -I../../include" \
-           AFLAGS="-t apple2" \
+           AFLAGS="-t apple2 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv apple2/crt0.o apple2.o
@@ -52,7 +56,7 @@ atarilib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t atari -I../../include" \
-           AFLAGS="-t atari" \
+           AFLAGS="-t atari -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv atari/crt0.o atari.o
@@ -60,19 +64,53 @@ atarilib:
            $(AR) a atari.lib $$i/*.o;\
        done
 
+#-----------------------------------------------------------------------------
+# Oric Atmos
+
+atmoslib:
+       for i in atmos common runtime; do \
+           CC=$(CC) \
+           AS=$(AS) \
+           CFLAGS="-Osir -g -T -t atmos -I../../include" \
+                   AFLAGS="-t atmos -I../../asminc" \
+           $(MAKE) -C $$i || exit 1; \
+       done
+       mv atmos/crt0.o atmos.o
+       for i in atmos common runtime; do \
+           $(AR) a atmos.lib $$i/*.o;\
+       done
+
+#-----------------------------------------------------------------------------
+# Vic20
+
+vic20lib:
+       for i in vic20 cbm common runtime conio dbg; do \
+           CC=$(CC) \
+           AS=$(AS) \
+           AFLAGS="-t vic20 -I../../asminc" \
+           CFLAGS="-Osir -g -T -t vic20 -I../../include" \
+           $(MAKE) -C $$i || exit 1; \
+       done
+       mv vic20/crt0.o vic20.o
+       for i in vic20 cbm common runtime conio dbg; do \
+           $(AR) a vic20.lib $$i/*.o;\
+       done
+
 #-----------------------------------------------------------------------------
 # C64
 
 c64lib:
-       for i in c64 cbm common runtime conio dbg; do \
-           CC=$(CC) \
+       for i in c64 cbm common runtime conio dbg tgi; do \
            AS=$(AS) \
+           CC=$(CC) \
+           LD=$(LD) \
+           AFLAGS="-t c64 -I../../asminc" \
            CFLAGS="-Osir -g -T -t c64 -I../../include" \
-           AFLAGS="-t c64" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv c64/crt0.o c64.o
-       for i in c64 cbm common runtime conio dbg; do \
+       cp c64/*.tgi .
+       for i in c64 cbm common runtime conio dbg tgi; do \
            $(AR) a c64.lib $$i/*.o;\
        done
 
@@ -84,7 +122,7 @@ c128lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t c128 -I../../include" \
-           AFLAGS="-t c128" \
+           AFLAGS="-t c128 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv c128/crt0.o c128.o
@@ -100,7 +138,7 @@ cbm510lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t cbm510 -I../../include" \
-           AFLAGS="-t cbm510" \
+           AFLAGS="-t cbm510 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv cbm510/crt0.o cbm510.o
@@ -116,7 +154,7 @@ cbm610lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t cbm610 -I../../include" \
-           AFLAGS="-t cbm610" \
+           AFLAGS="-t cbm610 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv cbm610/crt0.o cbm610.o
@@ -132,14 +170,14 @@ geoslib:
        AS=../$(AS) \
        AR=../$(AR) \
        CFLAGS="-Osir -g -T -t geos -I../../../include" \
-       AFLAGS="-t geos" \
+       AFLAGS="-t geos -I../../../asminc" \
        $(MAKE) -C geos || exit 1
        for i in common runtime; do \
            CC=$(CC) \
            AS=$(AS) \
            AR=$(AR) \
            CFLAGS="-Osir -g -T -t geos -I../../include" \
-           AFLAGS="-t geos" \
+           AFLAGS="-t geos -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        for i in common runtime; do \
@@ -160,7 +198,7 @@ petlib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t pet -I../../include" \
-           AFLAGS="-t pet" \
+           AFLAGS="-t pet -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv pet/crt0.o pet.o
@@ -176,7 +214,7 @@ plus4lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t plus4 -I../../include" \
-           AFLAGS="-t plus4" \
+           AFLAGS="-t plus4 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv plus4/crt0.o plus4.o
@@ -189,7 +227,7 @@ plus4lib:
 
 .PHONY: clean
 clean:
-       @for i in apple2 atari c128 c64 cbm cbm510 cbm610 common conio dbg geos pet plus4 runtime; do   \
+       @for i in apple2 atari c128 c64 cbm cbm510 cbm610 common conio dbg geos pet plus4 runtime tgi; do       \
           $(MAKE) -C $$i clean;                                                                        \
        done
 
@@ -201,3 +239,4 @@ zap:        clean
 
 
 
+