Improved Makefile by Greg King.

[cc65] / samples / Makefile

diff --git a/samples/Makefile b/samples/Makefile
index f8fc0ffe7bf00c6098ec4a2423a45db92fcb3621..44276154d8138e148f64cb1c19b2456ee8d4acf5 100644 (file)
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -7,12 +7,47 @@
 # Enter the target system here
 SYS    = c64
 
-CRT0           = ../libsrc/$(SYS).o
-CLIB   = ../libsrc/$(SYS).lib
-CC     = ../src/cc65/cc65
-CL     = ../src/cl65/cl65
-AS     = ../src/ca65/ca65
-LD     = ../src/ld65/ld65
+# Determine the path to the executables and libraries. If the samples
+# directory is part of a complete source tree, use the stuff from that
+# source tree; otherwise, use the "install" directories.
+ifeq "$(wildcard ../src)" ""
+# No source tree
+MOUS = /usr/lib/cc65/mou/$(SYS)*.mou
+TGI  = /usr/lib/cc65/tgi/$(SYS)*.tgi
+ifneq "$(wildcard /usr/local/lib/cc65)" ""
+MOUS = /usr/local/lib/cc65/mou/$(SYS)*.mou
+TGI  = /usr/local/lib/cc65/tgi/$(SYS)*.tgi
+endif
+ifdef CC65_HOME
+MOUS = $(CC65_HOME)/mou/$(SYS)*.mou
+TGI  = $(CC65_HOME)/tgi/$(SYS)*.tgi
+endif
+CLIB = --lib $(SYS).lib
+CL   = cl65
+CC   = cc65
+AS   = ca65
+LD   = ld65
+
+else
+# "samples/" is a part of a complete source tree.
+CA65_INC = ../asminc
+CC65_INC = ../include
+LD65_CFG = ../src/ld65/cfg
+LD65_LIB = ../libsrc
+LD65_OBJ = ../libsrc
+MOUS = ../libsrc/$(SYS)*.mou
+TGI  = ../libsrc/$(SYS)*.tgi
+CLIB = ../libsrc/$(SYS).lib
+CL   = ../src/cl65/cl65
+CC   = ../src/cc65/cc65
+AS   = ../src/ca65/ca65
+LD   = ../src/ld65/ld65
+
+MY_INC = --forget-inc-paths -I . -I $(CC65_INC)
+MY_ASM = --forget-inc-paths -I . -I $(CA65_INC)
+endif
+
+# This one comes with VICE
 C1541          = c1541
 
 
@@ -21,49 +56,88 @@ C1541       = c1541
 
 .c.o:
        @echo $<
-       @$(CC) -Oirs -T --forget-inc-paths --codesize 500 -g -t $(SYS) -I../include/ $<
+       @$(CC) $(MY_INC) -Oirs --codesize 500 -T -g -t $(SYS) $<
        @$(AS) $(basename $<).s
 
 .s.o:
        @echo $<
-       @$(AS) $(basename $<).s
+       @$(AS) $(MY_ASM) -t $(SYS) $<
+
+.o:
+       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^ $(CLIB)
 
 
 # --------------------------------------------------------------------------
-# Rules how to make each one of the binaries
+# List of executables. This list could be made target dependent by checking
+# $(SYS).
+
+EXELIST        =       ascii           \
+               diodemo         \
+               fire            \
+               gunzip65        \
+               hello           \
+               mandelbrot      \
+               mousedemo       \
+               nachtm          \
+               plasma          \
+               sieve           \
+               tgidemo
 
-EXELIST=ascii fire gunzip65 hello mousedemo nachtm plasma sieve tgidemo
+# --------------------------------------------------------------------------
+# Rules how to make each one of the binaries
 
 .PHONY:        all
 all:           $(EXELIST)
 
-ascii:                 $(CRT0) ascii.o $(CLIB)
-       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+ascii:         ascii.o
+
+diodemo:       diodemo.o
 
-fire:                  $(CRT0) fire.o $(CLIB)
-       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+fire:          fire.o
 
-gunzip65:              $(CRT0) gunzip65.o $(CLIB)
-       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+gunzip65:      gunzip65.o
 
-hello:                 $(CRT0) hello.o $(CLIB)
-       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+hello:         hello.o
 
-mousedemo:             $(CRT0) mousedemo.o $(CLIB)
-       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+# The Apple machines need the start address adjusted for the mandelbrot demo
+ifeq "$(SYS)" "apple2"
+mandelbrot:    mandelbrot.o
+       @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^ $(CLIB)
+else
+ifeq "$(SYS)" "apple2enh"
+mandelbrot:    mandelbrot.o
+       @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^ $(CLIB)
+else
+mandelbrot:    mandelbrot.o
+endif
+endif
 
-nachtm:                $(CRT0) nachtm.o $(CLIB)
-       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+# The Apple ][ needs the start address adjusted for the mousedemo
+ifeq "$(SYS)" "apple2"
+mousedemo:     mousedemo.o
+       @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^ $(CLIB)
+else
+mousedemo:     mousedemo.o
+endif
 
-plasma:                $(CRT0) plasma.o $(CLIB)
-       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+nachtm:                nachtm.o
 
-sieve:                 $(CRT0) sieve.o $(CLIB)
-       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+plasma:                plasma.o
 
-tgidemo:               $(CRT0) tgidemo.o $(CLIB)
-       @$(LD) -t $(SYS) -m $(basename $@).map -o $@ $^
+sieve:         sieve.o
 
+# The Apple machines need the start address adjusted for the tgidemo
+ifeq "$(SYS)" "apple2"
+tgidemo:       tgidemo.o
+       @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^ $(CLIB)
+else
+ifeq "$(SYS)" "apple2enh"
+tgidemo:       tgidemo.o
+       @$(LD) -t $(SYS) -m $(basename $@).map --start-addr 0x4000 -o $@ $^ $(CLIB)
+else
+tgidemo:       tgidemo.o
+endif
+endif
 
 # --------------------------------------------------------------------------
 # Rule to make a disk with all samples. Needs the c1541 program that comes
@@ -75,11 +149,11 @@ disk:      samples.d64
 samples.d64:   all
        @$(C1541) -format samples,AA  d64 $@ > /dev/null
        @for exe in $(EXELIST); do\
-           $(C1541) -attach $@ -write $$exe > /dev/null;\
-       done;\
-       for tgi in ../libsrc/$(SYS)*.tgi; do\
-           $(C1541) -attach $@ -write $$tgi > /dev/null;\
-       done;
+           $(C1541) -attach $@ -write $$exe > /dev/null || exit $$?;\
+       done
+       @for mod in $(TGI) $(MOUS); do\
+           $(C1541) -attach $@ -write $$mod > /dev/null || exit $$?;\
+       done
 
 # --------------------------------------------------------------------------
 # Cleanup rules
@@ -93,5 +167,3 @@ zap: clean
        $(RM) $(EXELIST) samples.d64
 
 
-
-