Switched Apple II output format to AppleSingle.

[cc65] / samples / Makefile

diff --git a/samples/Makefile b/samples/Makefile
index 00a9ce41d6d68617187f5f40711d9d23c622d0d3..6a6d93bc1feaa46dc9c79ddf7afa0a3e98087275 100644 (file)
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -35,26 +35,26 @@ else
 endif
 
 ifneq ($(filter disk samples.%,$(MAKECMDGOALS)),)
-TARGET_PATH := $(shell $(CL) --print-target-path)
+  TARGET_PATH := $(shell $(CL) --print-target-path)
 
-EMD := $(wildcard $(TARGET_PATH)/$(SYS)/drv/emd/*)
-MOU := $(wildcard $(TARGET_PATH)/$(SYS)/drv/mou/*)
-TGI := $(wildcard $(TARGET_PATH)/$(SYS)/drv/tgi/*)
+  EMD := $(wildcard $(TARGET_PATH)/$(SYS)/drv/emd/*)
+  MOU := $(wildcard $(TARGET_PATH)/$(SYS)/drv/mou/*)
+  TGI := $(wildcard $(TARGET_PATH)/$(SYS)/drv/tgi/*)
 
-# This one comes with VICE
-C1541 ?= c1541
+  # This one comes with VICE
+  C1541 ?= c1541
 
-# For this one see http://applecommander.sourceforge.net/
-AC ?= ac.jar
+  # For this one see https://applecommander.github.io/
+  AC ?= ac.jar
 
-# For this one see http://www.horus.com/~hias/atari/
-DIR2ATR ?= dir2atr
+  # For this one see http://www.horus.com/~hias/atari/
+  DIR2ATR ?= dir2atr
 
-DISK_c64       = samples.d64
-DISK_apple2    = samples.dsk
-DISK_apple2enh = samples.dsk
-DISK_atari     = samples.atr
-DISK_atarixl   = samples.atr
+  DISK_c64       = samples.d64
+  DISK_apple2    = samples.dsk
+  DISK_apple2enh = samples.dsk
+  DISK_atari     = samples.atr
+  DISK_atarixl   = samples.atr
 endif
 
 # --------------------------------------------------------------------------
@@ -66,8 +66,8 @@ LDFLAGS_mandelbrot_apple2enh = --start-addr 0x4000
 LDFLAGS_tgidemo_apple2       = --start-addr 0x4000
 LDFLAGS_tgidemo_apple2enh    = --start-addr 0x4000
 
-# The Apple ][ needs the start address adjusted for the mousetest
-LDFLAGS_mousetest_apple2 = --start-addr 0x4000
+# The Apple ][ needs the start address adjusted for the mousedemo
+LDFLAGS_mousedemo_apple2 = --start-addr 0x4000
 
 # The Apple machines need the end address adjusted for large programs
 LDFLAGS_gunzip65_apple2    = -D __HIMEM__=0xBF00
@@ -90,7 +90,7 @@ LDFLAGS_tgidemo_atarixl    = --start-addr 0x4000
 %: %.s
 
 .c.o:
-       $(CC) $(CFLAGS) -Oirs --codesize 500 -T -g -t $(SYS) $<
+       $(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $<
        $(AS) $(<:.c=.s)
 
 .s.o:
@@ -111,7 +111,7 @@ EXELIST_c64 =      \
         gunzip65   \
         hello      \
         mandelbrot \
-        mousetest  \
+        mousedemo  \
         multdemo   \
         nachtm     \
         ovrldemo   \
@@ -126,7 +126,7 @@ EXELIST_apple2 =   \
         gunzip65   \
         hello      \
         mandelbrot \
-        mousetest  \
+        mousedemo  \
         multdemo   \
         ovrldemo   \
         sieve      \
@@ -139,7 +139,7 @@ EXELIST_atari =    \
         gunzip65   \
         hello      \
         mandelbrot \
-        mousetest  \
+        mousedemo  \
         multdemo   \
         ovrldemo   \
         sieve      \
@@ -147,6 +147,9 @@ EXELIST_atari =    \
 
 EXELIST_atarixl = $(EXELIST_atari)
 
+EXELIST_atari2600 = \
+        atari2600hello
+
 # --------------------------------------------------------------------------
 # Rules to make the binaries and the disk
 
@@ -185,15 +188,15 @@ samples.d64: samples
        $(foreach file,$(EMD) $(MOU) $(TGI),$(D64_WRITE_recipe))
 
 # --------------------------------------------------------------------------
-# Rule to make an Apple II disk with all samples. Needs the Apple Commander
-# program available at http://applecommander.sourceforge.net/ and a template
-# disk named 'prodos.dsk'.
+# Rule to make an Apple II disk with all samples. Needs the AppleCommander
+# program available at https://applecommander.github.io/ and a template disk
+# named 'prodos.dsk'.
 
 define DSK_WRITE_BIN_recipe
 
 $(if $(findstring BF00,$(LDFLAGS_$(notdir $(file))_$(SYS))), \
   java -jar $(AC) -p $@ $(notdir $(file)).system sys <$(TARGET_PATH)/$(SYS)/util/loader.system)
-java -jar $(AC) -cc65 $@ $(notdir $(file)) bin <$(file)
+java -jar $(AC) -as $@ $(notdir $(file)) <$(file)
 
 endef # DSK_WRITE_BIN_recipe
 
@@ -234,10 +237,10 @@ samples.atr: samples
 # Installation rules
 
 INSTALL = install
-samplesdir = $(prefix)/share/cc65
+samplesdir = $(PREFIX)/share/cc65/samples
 
 install:
-       $(if $(prefix),,$(error variable `prefix' must be set))
+       $(if $(PREFIX),,$(error variable `PREFIX' must be set))
        $(INSTALL) -d $(DESTDIR)$(samplesdir)
        $(INSTALL) -d $(DESTDIR)$(samplesdir)/geos
        $(INSTALL) -d $(DESTDIR)$(samplesdir)/tutorial