Integrate CoCo Planes with VCC Plus and verified prototype startup
Preserve upstream application sources and notices. Add VCC Plus build and disk-loader integration, delivered CoCoPlanes.DSK, actual title/playfield captures and scoped build-43 public-MCP validation.
This commit is contained in:
1 parent
7939132267
commit
b56429d64f
13 files changed
+1075
-27
No files matched your search
@@ -11,9 +11,9 @@ TARGET = coco
|
||||
# Directories of required libraries (typically symlinks).
|
||||
# These libraries are available on the CMOC home page.
|
||||
#
|
||||
DECBFILE_LIB_DIR = decbfile
|
||||
CARDGAME_LIB_DIR = cardgame
|
||||
BCONTROL_LIB_DIR = bcontrol
|
||||
DECBFILE_LIB_DIR = $(wildcard decbfile)
|
||||
CARDGAME_LIB_DIR = $(wildcard cardgame)
|
||||
BCONTROL_LIB_DIR = $(wildcard bcontrol)
|
||||
|
||||
CMOC = cmoc
|
||||
PERL = perl
|
||||
@@ -139,15 +139,15 @@ SRC = $(NON_GEN_SRC) $(GEN_SRC)
|
||||
GEN_HEADERS =
|
||||
|
||||
ifeq "$(TARGET)" "coco"
|
||||
DECBFILE_CFLAGS = -I $(DECBFILE_LIB_DIR)
|
||||
DECBFILE_LDFLAGS = -L $(DECBFILE_LIB_DIR) -ldecbfile
|
||||
DECBFILE_CFLAGS = $(addprefix -I,$(DECBFILE_LIB_DIR))
|
||||
DECBFILE_LDFLAGS = $(addprefix -L,$(DECBFILE_LIB_DIR)) -ldecbfile
|
||||
endif
|
||||
|
||||
CARDGAME_CFLAGS = -I $(CARDGAME_LIB_DIR)
|
||||
CARDGAME_LDFLAGS = -L $(CARDGAME_LIB_DIR) -lcardgame
|
||||
CARDGAME_CFLAGS = $(addprefix -I,$(CARDGAME_LIB_DIR))
|
||||
CARDGAME_LDFLAGS = $(addprefix -L,$(CARDGAME_LIB_DIR)) -lcardgame
|
||||
|
||||
BCONTROL_CFLAGS = -I $(BCONTROL_LIB_DIR)
|
||||
BCONTROL_LDFLAGS = -L $(BCONTROL_LIB_DIR) -lbcontrol
|
||||
BCONTROL_CFLAGS = $(addprefix -I,$(BCONTROL_LIB_DIR))
|
||||
BCONTROL_LDFLAGS = $(addprefix -L,$(BCONTROL_LIB_DIR)) -lbcontrol
|
||||
|
||||
LIBS = $(DECBFILE_LDFLAGS) $(CARDGAME_LDFLAGS) $(BCONTROL_LDFLAGS)
|
||||
|
||||
@@ -157,6 +157,7 @@ OBJ = $(NON_GEN_OBJ) $(GEN_OBJ)
|
||||
|
||||
DSK = $(PACKAGE)-$(VERSION)-$(TARGET).dsk
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
all: $(DSK)
|
||||
|
||||
# title.xpm must be generated from title.xcf (typically with the GIMP,
|
||||
@@ -187,7 +188,7 @@ endif
|
||||
|
||||
# Main application, in raw format, to be loaded by loader.c, which is executable by DOS command.
|
||||
#
|
||||
$(PROG).app: $(PROG).o $(OBJ) $(CARDGAME_LIB_DIR)/libcardgame.a $(BCONTROL_LIB_DIR)/libbcontrol.a
|
||||
$(PROG).app: $(PROG).o $(OBJ) $(addsuffix /libcardgame.a,$(CARDGAME_LIB_DIR)) $(addsuffix /libbcontrol.a,$(BCONTROL_LIB_DIR))
|
||||
$(CMOC) --raw --$(TARGET) $(ORG) --limit=$(APP_MAX_END) $(LDFLAGS) -o $(PROG).app $(PROG).o $(OBJ) $(LIBS)
|
||||
|
||||
|
||||
@@ -238,15 +239,23 @@ endif
|
||||
# This loader program MUST be relocatable, so we do not pass --no-relocate.
|
||||
# It loads a file whose 11-character name must be consistent with $(EXE).
|
||||
#
|
||||
loader.bin: loader.c $(DECBFILE_LIB_DIR)/libdecbfile.a
|
||||
# The bundled decbfile exposes the sector API. Compile Pierre Sarrazin's
|
||||
# companion DOS-loader routine locally when using the installed archives.
|
||||
ifeq ($(strip $(DECBFILE_LIB_DIR)),)
|
||||
LOADER_SUPPORT = loader-support/runDOSLoader.c
|
||||
LOADER_INCLUDES = -Iloader-support
|
||||
LOADER_LIBS = -ldskcon-standalone
|
||||
endif
|
||||
|
||||
loader.bin: loader.c $(LOADER_SUPPORT) $(LOADER_SUPPORT:.c=.h) $(addsuffix /libdecbfile.a,$(DECBFILE_LIB_DIR))
|
||||
$(CMOC) $(LOADER_FLAGS) -o $@ \
|
||||
'-DEXECUTABLE_FILENAME="$(PROGRAM_ALL_CAPS_8_CHAR)APP"' \
|
||||
-DCLIENT_PROGRAM_START=0x$(APP_ENTRY) \
|
||||
--limit=0x3780 \
|
||||
$(WARNINGS) $(WERROR) $(INTERMEDIATE) $(OPTIM) \
|
||||
$(DECBFILE_CFLAGS) \
|
||||
loader.c \
|
||||
$(DECBFILE_LDFLAGS)
|
||||
$(LOADER_INCLUDES) loader.c $(LOADER_SUPPORT) \
|
||||
$(DECBFILE_LDFLAGS) $(LOADER_LIBS)
|
||||
|
||||
# Runs make with arguments $(RECURSION) in the library projects used by this package.
|
||||
# Supports the -n (dry run) option.
|
||||
@@ -256,10 +265,16 @@ export TARGET
|
||||
.PHONY: recurse
|
||||
recurse:
|
||||
ifeq "$(TARGET)" "coco"
|
||||
ifneq ($(strip $(DECBFILE_LIB_DIR)),)
|
||||
$(MAKE) -C $(DECBFILE_LIB_DIR) $(RECURSION)
|
||||
endif
|
||||
endif
|
||||
ifneq ($(strip $(CARDGAME_LIB_DIR)),)
|
||||
$(MAKE) -C $(CARDGAME_LIB_DIR) $(RECURSION)
|
||||
endif
|
||||
ifneq ($(strip $(BCONTROL_LIB_DIR)),)
|
||||
$(MAKE) -C $(BCONTROL_LIB_DIR) $(RECURSION)
|
||||
endif
|
||||
|
||||
clean:
|
||||
rm -f loader.bin $(PROG).app $(PROG).o $(OBJ) \
|
||||
@@ -306,25 +321,15 @@ DISTFILES = \
|
||||
sizes: $(PROG).app
|
||||
@$(PERL) -e '$$sz=-s "$(PROG).app"; printf("$(PROG).app loads %u B in \$$%X..\$$%X.\n", $$sz, 0x$(APP_ENTRY), 0x$(APP_ENTRY) + $$sz - 1);'
|
||||
|
||||
# Prerequisites.
|
||||
|
||||
$(CARDGAME_LIB_DIR)/pmode4game.h:
|
||||
@test -f $@ || echo "ERROR: Symlink '$(dir $@)' missing from current directory." && false
|
||||
|
||||
$(BCONTROL_LIB_DIR)/Joystick.h:
|
||||
@test -f $@ || echo "ERROR: Symlink '$(dir $@)' missing from current directory." && false
|
||||
|
||||
$(DECBFILE_LIB_DIR)/runDOSLoader.h:
|
||||
@test -f $@ || echo "ERROR: Symlink '$(dir $@)' missing from current directory." && false
|
||||
|
||||
# A source library override contributes its own headers to the dependency graph.
|
||||
DEPENDENCY_HEADERS = \
|
||||
$(NON_GEN_HEADERS) $(GEN_HEADERS) \
|
||||
$(CARDGAME_LIB_DIR)/pmode4game.h \
|
||||
$(BCONTROL_LIB_DIR)/Joystick.h
|
||||
$(addsuffix /pmode4game.h,$(CARDGAME_LIB_DIR)) \
|
||||
$(addsuffix /Joystick.h,$(BCONTROL_LIB_DIR))
|
||||
|
||||
ifeq "$(TARGET)" "coco"
|
||||
DEPENDENCY_HEADERS += \
|
||||
$(DECBFILE_LIB_DIR)/runDOSLoader.h
|
||||
$(addsuffix /runDOSLoader.h,$(DECBFILE_LIB_DIR))
|
||||
endif
|
||||
|
||||
$(NON_GEN_OBJ): $(DEPENDENCY_HEADERS)
|
||||
|
||||
Reference in new issue
Block a user