Add basic sound support

[cc65] / libsrc / Makefile

diff --git a/libsrc/Makefile b/libsrc/Makefile
index cb0c0dfa3eac2db87cebfe9a61fa93928e1945e2..101cca163d55afd6beef5ee6d91a6a048dc86f97 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -11,11 +11,13 @@
 AR = ../src/ar65/ar65
 AS = ../../src/ca65/ca65
 CC = ../../src/cc65/cc65
+CO = ../../src/co65/co65
 LD = ../../src/ld65/ld65
 
 # List of shared directories
 SHAREDDIRS =   cbm             \
                common          \
+               geos-common     \
                conio           \
                dbg             \
                em              \
@@ -36,7 +38,8 @@ ALLTARGETS =  apple2          \
                c64             \
                cbm510          \
                cbm610          \
-               geos            \
+               geos-apple      \
+               geos-cbm        \
                lynx            \
                nes             \
                pet             \
@@ -103,6 +106,7 @@ atarilib:
            $(MAKE) SYS=atari -C $$i || exit 1; \
            $(AR) a atari.lib $$i/*.o || exit 1; \
        done
+       cp atari/atari-130xe.emd atr130xe.emd
        cp atari/atari-stdjoy.joy ataristd.joy
        cp atari/atari-multijoy.joy atarimj8.joy
        cp atari/atari-10.tgi atari10.tgi
@@ -131,11 +135,12 @@ atarilib:
 
 .PHONY:        atmoslib
 atmoslib:
-       for i in runtime atmos common conio em joystick tgi zlib; do \
+       for i in runtime atmos common conio dbg em joystick tgi zlib; do \
            $(MAKE) SYS=atmos -C $$i || exit 1; \
            $(AR) a atmos.lib $$i/*.o || exit 1; \
        done
        cp atmos/*.joy .
+       cp atmos/*.ser .
        cp atmos/*.tgi .
        if [ -d atmos/extra ]; then \
            for i in atmos/extra/*.o; do \
@@ -152,8 +157,8 @@ c16lib:
            $(MAKE) SYS=c16 -C $$i || exit 1; \
            $(AR) a c16.lib $$i/*.o || exit 1; \
        done
-       cp c16/*.joy .
        cp c16/*.emd .
+       cp c16/*.joy .
        if [ -d c16/extra ]; then \
            for i in c16/extra/*.o; do \
                cp $$i c16-`basename $$i` || exit 1; \
@@ -245,39 +250,50 @@ cbm610lib:
            done \
        fi
 
+#-----------------------------------------------------------------------------
+# GEOS on the Apple
+
+.PHONY:        geos-applelib
+geos-applelib:
+       for i in geos-apple geos-common; do \
+           $(MAKE) SYS=geos-apple -C $$i || exit 1; \
+           TARGET_OBJS="$$TARGET_OBJS`(cd $$i && printf '%s|' *.o)`"; \
+           $(AR) a geos-apple.lib $$i/*.o || exit 1; \
+       done; \
+       TARGET_OBJS="$${TARGET_OBJS%?}"; \
+       for i in runtime common conio em joystick tgi zlib; do \
+           $(MAKE) SYS=geos-apple -C $$i || exit 1; \
+           SHARED_OBJS=`ls $$i/*.o | grep -vwE "$$TARGET_OBJS"`; \
+           $(AR) a geos-apple.lib $$SHARED_OBJS || exit 1; \
+       done
+       if [ -d geos-apple/extra ]; then \
+           for i in geos-apple/extra/*.o; do \
+               cp $$i geos-apple-`basename $$i` || exit 1; \
+           done \
+       fi
+
 #-----------------------------------------------------------------------------
 # GEOS on the C64/128
 
-.PHONY:        geoslib
-geoslib:
-       CC=../$(CC) \
-       AS=../$(AS) \
-       AR=../$(AR) \
-       LD=../$(LD) \
-       AFLAGS="-t geos --forget-inc-paths -I../../../asminc" \
-       CFLAGS="-Osir -g -T -t geos --forget-inc-paths -I. -I../../../include" \
-       $(MAKE) -C geos
-       for i in em joystick tgi conio common runtime zlib; do \
-           CC=$(CC) \
-           AS=$(AS) \
-           LD=$(LD) \
-           AFLAGS="-t geos --forget-inc-paths -I../../asminc" \
-           CFLAGS="-Osir -g -T -t geos --forget-inc-paths -I. -I../../include" \
-           $(MAKE) SYS=geos -C $$i || exit 1; \
-           for objfile in $$i/*.o; do \
-               if [ -f geos/$$objfile ]; then \
-                   $(AR) a geos.lib geos/$$objfile || exit 1; \
-               else \
-                   $(AR) a geos.lib $$objfile || exit 1; \
-               fi; \
-           done \
+.PHONY:        geos-cbmlib
+geos-cbmlib:
+       for i in geos-cbm geos-common; do \
+           $(MAKE) SYS=geos-cbm -C $$i || exit 1; \
+           TARGET_OBJS="$$TARGET_OBJS`(cd $$i && printf '%s|' *.o)`"; \
+           $(AR) a geos-cbm.lib $$i/*.o || exit 1; \
+       done; \
+       TARGET_OBJS="$${TARGET_OBJS%?}"; \
+       for i in runtime common conio em joystick tgi zlib; do \
+           $(MAKE) SYS=geos-cbm -C $$i || exit 1; \
+           SHARED_OBJS=`ls $$i/*.o | grep -vwE "$$TARGET_OBJS"`; \
+           $(AR) a geos-cbm.lib $$SHARED_OBJS || exit 1; \
        done
-       cp geos/devel/*.emd .
-       cp geos/devel/*.joy .
-       cp geos/devel/*.tgi .
-       if [ -d geos/extra ]; then \
-           for i in geos/extra/*.o; do \
-               cp $$i geos-`basename $$i` || exit 1; \
+       cp geos-cbm/*.emd .
+       cp geos-cbm/*.joy .
+       cp geos-cbm/*.tgi .
+       if [ -d geos-cbm/extra ]; then \
+           for i in geos-cbm/extra/*.o; do \
+               cp $$i geos-cbm-`basename $$i` || exit 1; \
            done \
        fi
 
@@ -309,6 +325,7 @@ neslib:
            $(AR) a nes.lib $$i/*.o || exit 1; \
        done
        cp nes/*.joy .
+       cp nes/*.tgi .
        if [ -d nes/extra ]; then \
            for i in nes/extra/*.o; do \
                cp $$i nes-`basename $$i` || exit 1; \