Replaced whole bunch for Makefiles with a single generic Makefile.

- No complex shell logic.
- "Source file shadowing" for all targets via vpath.
- Dependency handling.
- True incremental build.
- Don't write into source directories.
- Easy cleanup by just removing 'wrk'.
This commit is contained in:
Oliver Schmidt
2013-05-04 22:15:30 +02:00
parent 008b4c4e1d
commit 81e467cdc2
24 changed files with 263 additions and 420 deletions

View File

@@ -1,23 +1,100 @@
# -*- make -*- CBMS = c128 \
# c16 \
# Makefile for CC65 Libraries c64 \
# cbm510 \
cbm610 \
pet \
plus4 \
vic20
.SUFFIXES: .o .obj .s .c GEOS = geos-apple \
geos-cbm
# Defines for executables. AR is used within this makefile, the others are TARGETS = $(CBMS) \
# passed to the submakes and contain paths relative to the subdirectories $(GEOS) \
# handled by the make subprocesses. apple2 \
AR = ../src/ar65/ar65 apple2enh \
AS = ../../src/ca65/ca65 atari \
CC = ../../src/cc65/cc65 atmos \
CO = ../../src/co65/co65 lynx \
LD = ../../src/ld65/ld65 nes \
supervision
# List of shared directories DRVTYPES = emd \
SHAREDDIRS = cbm \ joy \
common \ mou \
geos-common \ ser \
tgi
# Every target requires its individual vpath setting but the vpath directive
# acts globally. Therefore each target is built in a separate make instance.
ifeq ($(words $(MAKECMDGOALS)),1)
ifeq ($(MAKECMDGOALS),$(filter $(MAKECMDGOALS),$(TARGETS)))
TARGET = $(MAKECMDGOALS)
endif
endif
.SUFFIXES:
.PHONY: all $(TARGETS) mostlyclean clean
ifndef TARGET
all: $(TARGETS)
$(TARGETS):
@$(MAKE) --no-print-directory $@
mostlyclean:
$(RM) -r ../wrk
clean: mostlyclean
$(RM) -r ../lib $(addprefix ../,$(DRVTYPES))
else # TARGET
CFLAGS += -t $(TARGET) -Osir --create-dep $(@:.o=.d)
EXTZP = cbm510 \
cbm610 \
lynx
MKINC = $(GEOS) \
atari \
nes
GEOSDIRS = common \
conio \
disk \
dlgbox \
file \
graph \
memory \
menuicon \
mousesprite \
process \
runtime \
system
ifeq ($(TARGET),apple2enh)
OBJPFX = a2
DRVPFX = a2e
DIRS = apple2
else
DIRS = $(TARGET)
endif
ifeq ($(TARGET),$(filter $(TARGET),$(CBMS)))
DIRS += cbm
endif
ifeq ($(TARGET),$(filter $(TARGET),$(GEOS)))
DIRS += $(addprefix $(TARGET)/, $(GEOSDIRS))
DIRS += $(addprefix geos-common/,$(GEOSDIRS))
endif
DIRS += common \
conio \ conio \
dbg \ dbg \
em \ em \
@@ -28,392 +105,99 @@ SHAREDDIRS = cbm \
tgi \ tgi \
zlib zlib
# List of all targets vpath %.s $(DIRS)
ALLTARGETS = apple2 \ vpath %.c $(DIRS)
apple2enh \
atari \
atmos \
c128 \
c16 \
c64 \
cbm510 \
cbm610 \
geos-apple \
geos-cbm \
lynx \
nes \
pet \
plus4 \
supervision \
vic20
#----------------------------------------------------------------------------- OBJS := $(patsubst %.s,%.o,$(foreach dir,$(DIRS),$(wildcard $(dir)/*.s)))
OBJS += $(patsubst %.c,%.o,$(foreach dir,$(DIRS),$(wildcard $(dir)/*.c)))
.PHONY: all OBJS := $(addprefix ../wrk/$(TARGET)/,$(sort $(notdir $(OBJS))))
all:
for tgt in $(ALLTARGETS); do \
$(MAKE) mostly-clean "$$tgt"lib || exit 1; \
done
#----------------------------------------------------------------------------- DEPS = $(OBJS:.o=.d)
# Apple ][
.PHONY: apple2lib ZPOBJ = ../wrk/$(TARGET)/zeropage.o
apple2lib: ifeq ($(TARGET),$(filter $(TARGET),$(EXTZP)))
for i in runtime apple2 common conio dbg em joystick mouse serial tgi zlib; do \ ZPOBJ += ../wrk/$(TARGET)/extzp.o
$(MAKE) SYS=apple2 -C $$i || exit 1; \ endif
$(AR) a apple2.lib $$i/*.o || exit 1; \
done
cp apple2/apple2-auxmem.emd a2.auxmem.emd
cp apple2/apple2-stdjoy.joy a2.stdjoy.joy
cp apple2/apple2-stdmou.mou a2.stdmou.mou
cp apple2/apple2-ssc.ser a2.ssc.ser
cp apple2/apple2-280-192-8.tgi a2.hi.tgi
cp apple2/apple2-40-48-16.tgi a2.lo.tgi
if [ -d apple2/extra ]; then \
for i in apple2/extra/*.o; do \
cp $$i apple2-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- ifeq ($(TARGET),$(filter $(TARGET),$(MKINC)))
# enhanced Apple //e include $(TARGET)/Makefile.inc
endif
.PHONY: apple2enhlib ##########
apple2enhlib:
for i in runtime apple2enh common conio dbg em joystick mouse serial tgi zlib; do \
$(MAKE) SYS=apple2enh -C $$i || exit 1; \
$(AR) a apple2enh.lib $$i/*.o || exit 1; \
done
cp apple2enh/apple2-auxmem.emd a2e.auxmem.emd
cp apple2enh/apple2-stdjoy.joy a2e.stdjoy.joy
cp apple2enh/apple2-stdmou.mou a2e.stdmou.mou
cp apple2enh/apple2-ssc.ser a2e.ssc.ser
cp apple2enh/apple2-280-192-8.tgi a2e.hi.tgi
cp apple2enh/apple2-40-48-16.tgi a2e.lo.tgi
if [ -d apple2enh/extra ]; then \
for i in apple2enh/extra/*.o; do \
cp $$i apple2enh-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- define DRVTYPE_template
# Atari
.PHONY: atarilib $1_SRCDIR = $$(firstword $$(DIRS))/$1
atarilib: $1_OBJDIR = ../wrk/$$(TARGET)/$1
for i in runtime atari common conio dbg em joystick tgi zlib; do \ $1_DRVDIR = ../$1
$(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
cp atari/atari-10p2.tgi atr10p2.tgi
cp atari/atari-11.tgi atari11.tgi
cp atari/atari-14.tgi atari14.tgi
cp atari/atari-15.tgi atari15.tgi
cp atari/atari-15p2.tgi atr15p2.tgi
cp atari/atari-3.tgi atari3.tgi
cp atari/atari-4.tgi atari4.tgi
cp atari/atari-5.tgi atari5.tgi
cp atari/atari-6.tgi atari6.tgi
cp atari/atari-7.tgi atari7.tgi
cp atari/atari-8.tgi atari8.tgi
cp atari/atari-8p2.tgi atr8p2.tgi
cp atari/atari-9.tgi atari9.tgi
cp atari/atari-9p2.tgi atr9p2.tgi
if [ -d atari/extra ]; then \
for i in atari/extra/*.o; do \
cp $$i atari-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- $1_OBJPAT = $$($1_OBJDIR)/$$(OBJPFX)%.o
# Oric Atmos $1_DRVPAT = $$($1_DRVDIR)/$$(DRVPFX)%.$1
$1_STCPAT = ../wrk/$$(TARGET)/$$(DRVPFX)%-$1.o
.PHONY: atmoslib $1_OBJS := $$(patsubst $$($1_SRCDIR)/%.s,$$($1_OBJDIR)/%.o,$$(wildcard $$($1_SRCDIR)/*.s))
atmoslib:
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 \
cp $$i atmos-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- $1_DRVS = $$(patsubst $$($1_OBJPAT),$$($1_DRVPAT),$$($1_OBJS))
# C16, C116
.PHONY: c16lib $1_STCS = $$(patsubst $$($1_DRVPAT),$$($1_STCPAT),$$($1_DRVS))
c16lib:
for i in runtime c16 cbm common conio dbg em joystick mouse tgi zlib; do \
$(MAKE) SYS=c16 -C $$i || exit 1; \
$(AR) a c16.lib $$i/*.o || exit 1; \
done
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; \
done \
fi
#----------------------------------------------------------------------------- $$($1_OBJS): | $$($1_OBJDIR)
# C64
.PHONY: c64lib $$($1_OBJDIR):
c64lib: mkdir -p $$@
for i in runtime c64 cbm common conio dbg em joystick mouse serial tgi zlib; do \
$(MAKE) SYS=c64 -C $$i || exit 1; \
$(AR) a c64.lib $$i/*.o || exit 1; \
done
cp c64/*.emd .
cp c64/*.joy .
cp c64/c64-1351.mou .
cp c64/c64-joymouse.mou c64-joy.mou
cp c64/c64-potmouse.mou c64-pot.mou
cp c64/*.ser .
cp c64/c64-320-200-2.tgi c64-hi.tgi
if [ -d c64/extra ]; then \
for i in c64/extra/*.o; do \
cp $$i c64-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- $$($1_DRVPAT): $$($1_OBJPAT) $$(ZPOBJ) | $$($1_DRVDIR)
# C128 $$(LD) -o $$@ -t module $$^
.PHONY: c128lib $$($1_DRVDIR):
c128lib: mkdir $$@
for i in runtime c128 cbm common conio dbg em joystick mouse serial tgi zlib; do \
$(MAKE) SYS=c128 -C $$i || exit 1; \
$(AR) a c128.lib $$i/*.o || exit 1; \
done
cp c128/*.emd .
cp c128/*.joy .
cp c128/c128-1351.mou .
cp c128/c128-joymouse.mou c128-joy.mou
cp c128/c128-potmouse.mou c128-pot.mou
cp c128/*.ser .
cp c128/c128-640-200-2.tgi c128-vdc.tgi
cp c128/c128-640-480-2.tgi c128-vdc2.tgi
if [ -d cbm/extra ]; then \
for i in cbm/extra/*.o; do \
cp $$i cbm-`basename $$i` || exit 1; \
done \
fi
if [ -d c128/extra ]; then \
for i in c128/extra/*.o; do \
cp $$i c128-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- $(TARGET): $$($1_DRVS)
# Commodore P500 / CBM 5x0
.PHONY: cbm510lib $$($1_STCPAT): $$($1_DRVPAT)
cbm510lib: $$(CO) -o $$(@:.o=.s) --code-label _$$(subst -,_,$$(subst .,_,$$(<F))) $$<
for i in runtime cbm510 cbm common conio dbg em joystick mouse serial tgi zlib; do \ $$(CC) -c -t $$(TARGET) -o $$@ $$(@:.o=.s)
$(MAKE) SYS=cbm510 -C $$i || exit 1; \
$(AR) a cbm510.lib $$i/*.o || exit 1; \
done
cp cbm510/*.emd .
cp cbm510/cbm510-stdjoy.joy cbm510-std.joy
cp cbm510/cbm510-stdser.ser cbm510-std.ser
if [ -d cbm510/extra ]; then \
for i in cbm510/extra/*.o; do \
cp $$i cbm510-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- OBJS += $$($1_STCS)
# PET-II series
.PHONY: cbm610lib DEPS += $$($1_OBJS:.o=.d)
cbm610lib:
for i in runtime cbm610 cbm common conio dbg em joystick serial tgi zlib; do \
$(MAKE) SYS=cbm610 -C $$i || exit 1; \
$(AR) a cbm610.lib $$i/*.o || exit 1; \
done
cp cbm610/*.emd .
cp cbm610/cbm610-stdser.ser cbm610-std.ser
if [ -d cbm610/extra ]; then \
for i in cbm610/extra/*.o; do \
cp $$i cbm610-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- endef
# 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
#----------------------------------------------------------------------------- $(foreach drvtype,$(DRVTYPES),$(eval $(call DRVTYPE_template,$(drvtype))))
# GEOS on the C64/128
.PHONY: geos-cbmlib ifdef CC65_HOME
geos-cbmlib: AR = $(CC65_HOME)/bin/ar65
for i in geos-cbm geos-common; do \ CC = $(CC65_HOME)/bin/cl65
$(MAKE) SYS=geos-cbm -C $$i || exit 1; \ CO = $(CC65_HOME)/bin/co65
TARGET_OBJS="$$TARGET_OBJS`(cd $$i && printf '%s|' *.o)`"; \ LD = $(CC65_HOME)/bin/ld65
$(AR) a geos-cbm.lib $$i/*.o || exit 1; \ else
done; \ AR = ../bin/ar65
TARGET_OBJS="$${TARGET_OBJS%?}"; \ CC = ../bin/cl65
for i in runtime common conio em joystick tgi zlib; do \ CO = ../bin/co65
$(MAKE) SYS=geos-cbm -C $$i || exit 1; \ LD = ../bin/ld65
SHARED_OBJS=`ls $$i/*.o | grep -vwE "$$TARGET_OBJS"`; \ endif
$(AR) a geos-cbm.lib $$SHARED_OBJS || exit 1; \
done
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
#----------------------------------------------------------------------------- ../wrk/$(TARGET)/%.o: %.s | ../wrk/$(TARGET)
# Lynx $(CC) -c $(CFLAGS) -o $@ $<
.PHONY: lynxlib ../wrk/$(TARGET)/%.o: %.c | ../wrk/$(TARGET)
lynxlib: $(CC) -c $(CFLAGS) -o $@ $<
for i in runtime lynx common conio em joystick serial tgi zlib; do \
$(MAKE) SYS=lynx -C $$i || exit 1; \
$(AR) a lynx.lib $$i/*.o || exit 1; \
done
cp lynx/*.joy .
cp lynx/*.ser .
cp lynx/*.tgi .
if [ -d lynx/extra ]; then \
for i in lynx/extra/*.o; do \
cp $$i lynx-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- ../wrk/$(TARGET):
# NES mkdir -p $@
.PHONY: neslib ../lib/$(TARGET).lib: $(OBJS) | ../lib
neslib: $(AR) a $@ $?
for i in runtime nes common conio em joystick tgi zlib; do \
$(MAKE) SYS=nes -C $$i || exit 1; \
$(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; \
done \
fi
#----------------------------------------------------------------------------- ../lib:
# CBM PET machines mkdir $@
.PHONY: petlib $(TARGET): ../lib/$(TARGET).lib
petlib:
for i in runtime pet cbm common conio dbg em joystick tgi zlib; do \
$(MAKE) SYS=pet -C $$i || exit 1; \
$(AR) a pet.lib $$i/*.o || exit 1; \
done
cp pet/*.joy .
if [ -d pet/extra ]; then \
for i in pet/extra/*.o; do \
cp $$i pet-`basename $$i` || exit 1; \
done \
fi
#----------------------------------------------------------------------------- -include $(DEPS)
# Commodore Plus/4
.PHONY: plus4lib endif # TARGET
plus4lib:
for i in runtime plus4 cbm common conio dbg em joystick mouse serial tgi zlib; do \
$(MAKE) SYS=plus4 -C $$i || exit 1; \
$(AR) a plus4.lib $$i/*.o || exit 1; \
done
cp plus4/*.joy .
cp plus4/*.ser .
if [ -d plus4/extra ]; then \
for i in plus4/extra/*.o; do \
cp $$i plus4-`basename $$i` || exit 1; \
done \
fi
#-----------------------------------------------------------------------------
# Supervision
.PHONY: supervisionlib
supervisionlib:
for i in runtime supervision common; do \
$(MAKE) SYS=supervision -C $$i || exit 1; \
$(AR) a supervision.lib $$i/*.o || exit 1; \
done
if [ -d supervision/extra ]; then \
for i in supervision/extra/*.o; do \
cp $$i supervision-`basename $$i` || exit 1; \
done \
fi
#-----------------------------------------------------------------------------
# Vic20
.PHONY: vic20lib
vic20lib:
for i in runtime vic20 cbm common conio dbg em joystick mouse tgi zlib; do \
$(MAKE) SYS=vic20 -C $$i || exit 1; \
$(AR) a vic20.lib $$i/*.o || exit 1; \
done
cp vic20/*.joy .
if [ -d vic20/extra ]; then \
for i in vic20/extra/*.o; do \
cp $$i vic20-`basename $$i` || exit 1; \
done \
fi
#-----------------------------------------------------------------------------
# Dummy targets
.PHONY: mostly-clean
mostly-clean:
@for i in $(SHAREDDIRS); do \
$(MAKE) --no-print-directory -C $$i clean || exit 1; \
done
.PHONY: clean
clean: mostly-clean
@for i in $(ALLTARGETS); do \
$(MAKE) -C $$i $@ || exit 1; \
done
.PHONY: zap
zap:
@for i in $(SHAREDDIRS) $(ALLTARGETS); do \
$(MAKE) -C $$i $@ || exit 1; \
done
@$(RM) *.lib *.o *.emd *.joy *.mou *.ser *.tgi

View File

@@ -7,8 +7,16 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _apple2_stdjoy .ifdef __APPLE2ENH__
.import _a2e_stdjoy_joy
.else
.import _a2_stdjoy_joy
.endif
.rodata .rodata
_joy_static_stddrv := _apple2_stdjoy .ifdef __APPLE2ENH__
_joy_static_stddrv := _a2e_stdjoy_joy
.else
_joy_static_stddrv := _a2_stdjoy_joy
.endif

View File

@@ -7,8 +7,16 @@
; ;
.export _mouse_static_stddrv .export _mouse_static_stddrv
.import _apple2_stdmou .ifdef __APPLE2ENH__
.import _a2e_stdmou_mou
.else
.import _a2_stdmou_mou
.endif
.rodata .rodata
_mouse_static_stddrv := _apple2_stdmou .ifdef __APPLE2ENH__
_mouse_static_stddrv := _a2e_stdmou_mou
.else
_mouse_static_stddrv := _a2_stdmou_mou
.endif

View File

@@ -7,8 +7,16 @@
; ;
.export _tgi_static_stddrv .export _tgi_static_stddrv
.import _apple2_280_192_8 .ifdef __APPLE2ENH__
.import _a2e_hi_tgi
.else
.import _a2_hi_tgi
.endif
.rodata .rodata
_tgi_static_stddrv := _apple2_280_192_8 .ifdef __APPLE2ENH__
_tgi_static_stddrv := _a2e_hi_tgi
.else
_tgi_static_stddrv := _a2_hi_tgi
.endif

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _atari_stdjoy .import _ataristd_joy
.rodata .rodata
_joy_static_stddrv := _atari_stdjoy _joy_static_stddrv := _ataristd_joy

View File

@@ -7,8 +7,8 @@
; ;
.export _tgi_static_stddrv .export _tgi_static_stddrv
.import _atari_8 .import _atari8_tgi
.rodata .rodata
_tgi_static_stddrv := _atari_8 _tgi_static_stddrv := _atari8_tgi

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _atmos_pase .import _atmos_pase_joy
.rodata .rodata
_joy_static_stddrv := _atmos_pase _joy_static_stddrv := _atmos_pase_joy

View File

@@ -7,8 +7,8 @@
; ;
.export _tgi_static_stddrv .export _tgi_static_stddrv
.import _atmos_240_200_2 .import _atmos_240_200_2_tgi
.rodata .rodata
_tgi_static_stddrv := _atmos_240_200_2 _tgi_static_stddrv := _atmos_240_200_2_tgi

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _c128_stdjoy .import _c128_stdjoy_joy
.rodata .rodata
_joy_static_stddrv := _c128_stdjoy _joy_static_stddrv := _c128_stdjoy_joy

View File

@@ -7,8 +7,8 @@
; ;
.export _mouse_static_stddrv .export _mouse_static_stddrv
.import _c128_1351 .import _c128_1351_mou
.rodata .rodata
_mouse_static_stddrv := _c128_1351 _mouse_static_stddrv := _c128_1351_mou

View File

@@ -7,8 +7,8 @@
; ;
.export _tgi_static_stddrv .export _tgi_static_stddrv
.import _c128_640_200_2 .import _c128_vdc_tgi
.rodata .rodata
_tgi_static_stddrv := _c128_640_200_2 _tgi_static_stddrv := _c128_vdc_tgi

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _c16_stdjoy .import _c16_stdjoy_joy
.rodata .rodata
_joy_static_stddrv := _c16_stdjoy _joy_static_stddrv := _c16_stdjoy_joy

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _c64_stdjoy .import _c64_stdjoy_joy
.rodata .rodata
_joy_static_stddrv := _c64_stdjoy _joy_static_stddrv := _c64_stdjoy_joy

View File

@@ -7,8 +7,8 @@
; ;
.export _mouse_static_stddrv .export _mouse_static_stddrv
.import _c64_1351 .import _c64_1351_mou
.rodata .rodata
_mouse_static_stddrv := _c64_1351 _mouse_static_stddrv := _c64_1351_mou

View File

@@ -7,8 +7,8 @@
; ;
.export _tgi_static_stddrv .export _tgi_static_stddrv
.import _c64_320_200_2 .import _c64_hi_tgi
.rodata .rodata
_tgi_static_stddrv := _c64_320_200_2 _tgi_static_stddrv := _c64_hi_tgi

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _cbm510_stdjoy .import _cbm510_std_joy
.rodata .rodata
_joy_static_stddrv := _cbm510_stdjoy _joy_static_stddrv := _cbm510_std_joy

View File

@@ -80,6 +80,12 @@ static char GetKeyUpdate (void);
# endif # endif
# endif # endif
#endif #endif
#ifndef COLOR_BLACK
# define COLOR_BLACK 0
#endif
#ifndef COLOR_WHITE
# define COLOR_WHITE 1
#endif
/* Screen definitions */ /* Screen definitions */
#if defined(__CBM610__) #if defined(__CBM610__)
@@ -98,10 +104,39 @@ static char GetKeyUpdate (void);
#endif #endif
/* Replacement key definitions */ /* Replacement key definitions */
#if defined(__APPLE2__) #if defined(__APPLE2__) || defined(__LYNX__) || defined(__SUPERVISION__)
# define CH_DEL ('H' - 'A' + 1) /* Ctrl+H */ # define CH_DEL ('H' - 'A' + 1) /* Ctrl+H */
#endif #endif
/* Replacement char definitions */
#ifndef CH_ULCORNER
# define CH_ULCORNER '+'
#endif
#ifndef CH_URCORNER
# define CH_URCORNER '+'
#endif
#ifndef CH_LLCORNER
# define CH_LLCORNER '+'
#endif
#ifndef CH_LRCORNER
# define CH_LRCORNER '+'
#endif
#ifndef CH_TTEE
# define CH_TTEE '+'
#endif
#ifndef CH_LTEE
# define CH_LTEE '+'
#endif
#ifndef CH_RTEE
# define CH_RTEE '+'
#endif
#ifndef CH_BTEE
# define CH_BTEE '+'
#endif
#ifndef CH_CROSS
# define CH_CROSS '+'
#endif
/* Defines for opcodes */ /* Defines for opcodes */
#define OPC_BRK 0x00 #define OPC_BRK 0x00
#define OPC_BPL 0x10 #define OPC_BPL 0x10

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _lynx_stdjoy .import _lynx_stdjoy_joy
.rodata .rodata
_joy_static_stddrv := _lynx_stdjoy _joy_static_stddrv := _lynx_stdjoy_joy

View File

@@ -7,8 +7,8 @@
; ;
.export _tgi_static_stddrv .export _tgi_static_stddrv
.import _lynx_160_102_16 .import _lynx_160_102_16_tgi
.rodata .rodata
_tgi_static_stddrv := _lynx_160_102_16 _tgi_static_stddrv := _lynx_160_102_16_tgi

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _nes_stdjoy .import _nes_stdjoy_joy
.rodata .rodata
_joy_static_stddrv := _nes_stdjoy _joy_static_stddrv := _nes_stdjoy_joy

View File

@@ -7,8 +7,8 @@
; ;
.export _tgi_static_stddrv .export _tgi_static_stddrv
.import _nes_64_56_2 .import _nes_64_56_2_tgi
.rodata .rodata
_tgi_static_stddrv := _nes_64_56_2 _tgi_static_stddrv := _nes_64_56_2_tgi

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _pet_stdjoy .import _pet_stdjoy_joy
.rodata .rodata
_joy_static_stddrv := _pet_stdjoy _joy_static_stddrv := _pet_stdjoy_joy

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _plus4_stdjoy .import _plus4_stdjoy_joy
.rodata .rodata
_joy_static_stddrv := _plus4_stdjoy _joy_static_stddrv := _plus4_stdjoy_joy

View File

@@ -7,8 +7,8 @@
; ;
.export _joy_static_stddrv .export _joy_static_stddrv
.import _vic20_stdjoy .import _vic20_stdjoy_joy
.rodata .rodata
_joy_static_stddrv := _vic20_stdjoy _joy_static_stddrv := _vic20_stdjoy_joy