Merge branch 'master' into sane_makefile_output
This commit is contained in:
@@ -109,6 +109,7 @@ DISK_apple2 = samples.dsk
|
||||
DISK_apple2enh = samples.dsk
|
||||
DISK_atari = samples.atr
|
||||
DISK_atarixl = samples.atr
|
||||
DISK_plus4 = samples.d64
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# System-dependent settings
|
||||
@@ -156,6 +157,8 @@ LDFLAGS_tgidemo_atarixl = --start-addr 0x4000
|
||||
.o:
|
||||
ifeq ($(SYS),vic20)
|
||||
$(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -C vic20-32k.cfg -m $@.map $^ $(SYS).lib
|
||||
else ifeq ($(SYS),plus4)
|
||||
$(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -C plus4-hires.cfg -m $@.map $^ $(SYS).lib
|
||||
else
|
||||
$(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -t $(SYS) -m $@.map $^ $(SYS).lib
|
||||
endif
|
||||
@@ -168,6 +171,11 @@ DIRLIST = tutorial geos atari2600 atari5200 apple2 gamate lynx supervision sym1
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# Lists of executables
|
||||
EXELIST_agat = \
|
||||
ascii \
|
||||
checkversion \
|
||||
hello \
|
||||
sieve
|
||||
|
||||
EXELIST_apple2 = \
|
||||
ascii \
|
||||
@@ -331,9 +339,11 @@ EXELIST_plus4 = \
|
||||
enumdevdir \
|
||||
gunzip65 \
|
||||
hello \
|
||||
mandelbrot \
|
||||
terminal \
|
||||
tinyshell \
|
||||
sieve
|
||||
sieve \
|
||||
tgidemo
|
||||
|
||||
EXELIST_sim6502 = \
|
||||
checkversion \
|
||||
@@ -400,6 +410,7 @@ all:
|
||||
# --------------------------------------------------------------------------
|
||||
# List of every supported platform
|
||||
TARGETS := \
|
||||
agat \
|
||||
apple2 \
|
||||
apple2enh \
|
||||
atari \
|
||||
@@ -455,7 +466,15 @@ multdemo: multidemo.o
|
||||
ovrldemo: overlaydemo.o
|
||||
$(LD) $(LDFLAGS) -o $@ -C $(SYS)-overlay.cfg -m $@.map $^ $(SYS).lib
|
||||
|
||||
OVERLAYLIST := $(foreach I,1 2 3,multdemo.$I ovrldemo.$I)
|
||||
OVERLAYLIST :=
|
||||
|
||||
ifneq ($(filter ovrldemo,$(EXELIST_$(SYS))),)
|
||||
OVERLAYLIST += $(foreach I,1 2 3,ovrldemo.$I)
|
||||
endif
|
||||
|
||||
ifneq ($(filter multdemo,$(EXELIST_$(SYS))),)
|
||||
OVERLAYLIST += $(foreach I,1 2 3,multdemo.$I)
|
||||
endif
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# TGI programs on the VIC-20 need a special ld65 configuration file.
|
||||
|
||||
Reference in New Issue
Block a user