Fixed a bug

[cc65] / libsrc / Makefile

diff --git a/libsrc/Makefile b/libsrc/Makefile
index b6f3152d8354c96ae50b4649e04f573560ea1c9a..f0ae5e46c7201b6c7ef40581c186cf46621a0c62 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -4,10 +4,11 @@
 
 .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.
-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
 
@@ -15,6 +16,7 @@ LD = ../../src/ld65/ld65
 ALLTARGETS =   apple2lib       \
                atarilib        \
                atmoslib        \
+               vic20lib        \
                c64lib          \
                c128lib         \
                cbm510lib       \
@@ -29,7 +31,7 @@ all:
        for tgt in $(ALLTARGETS); do            \
            $(MAKE) clean $$tgt || exit 1;      \
        done
-                       
+
 #-----------------------------------------------------------------------------
 # Apple ][
 
@@ -78,6 +80,22 @@ atmoslib:
            $(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
 
@@ -91,6 +109,7 @@ c64lib:
            $(MAKE) -C $$i || exit 1; \
        done
        mv c64/crt0.o c64.o
+       cp c64/*.tgi .
        for i in c64 cbm common runtime conio dbg tgi; do \
            $(AR) a c64.lib $$i/*.o;\
        done