Support VCC Plus builds with verified disk and MCP screenshots

This commit is contained in:
Brian Holman committed 2026-11-09 23:19:55 -07:00
1 parent 5a725e2a5b
commit 42bf10fb87
12 files changed
+788 -19

No files matched your search

+25 -19
View File
@@ -11,8 +11,8 @@ 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
DECBFILE_LIB_DIR = $(wildcard decbfile)
CARDGAME_LIB_DIR = $(wildcard cardgame)
CMOC = cmoc
PERL = perl
@@ -74,11 +74,11 @@ SRC = $(NON_GEN_SRC) $(GEN_SRC)
GEN_HEADERS = scoring.h
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
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
CPROG_LIBS = $(DECBFILE_LDFLAGS) $(CARDGAME_LDFLAGS)
@@ -88,6 +88,7 @@ OBJ = $(NON_GEN_OBJ) $(GEN_OBJ)
DSK = $(PACKAGE)-$(VERSION)-$(TARGET).dsk
.DELETE_ON_ERROR:
all: $(DSK)
scoring.h: generate-scoring.pl
@@ -110,7 +111,7 @@ $(DSK): $(PROG).app loader.bin
# Main application, in raw format, to be loaded by loader.c, which is executable by DOS command.
#
$(PROG).app: $(OBJ) $(CARDGAME_LIB_DIR)/libcardgame.a
$(PROG).app: $(OBJ) $(addsuffix /libcardgame.a,$(CARDGAME_LIB_DIR))
$(CMOC) --raw --$(TARGET) $(LDFLAGS) -o $(PROG).app $(OBJ) $(CPROG_LIBS)
@@ -144,15 +145,23 @@ check: $(DSK)
# 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) --dos -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.
@@ -161,8 +170,12 @@ loader.bin: loader.c $(DECBFILE_LIB_DIR)/libdecbfile.a
export TARGET
.PHONY: recurse
recurse:
ifneq ($(strip $(DECBFILE_LIB_DIR)),)
$(MAKE) -C $(DECBFILE_LIB_DIR) $(RECURSION)
endif
ifneq ($(strip $(CARDGAME_LIB_DIR)),)
$(MAKE) -C $(CARDGAME_LIB_DIR) $(RECURSION)
endif
clean:
rm -f loader.bin $(PROG).app $(OBJ) \
@@ -209,13 +222,6 @@ CLEANFILES = \
sizes: $(PROG).app
@$(PERL) -e 'printf("$(PROG).app loads in \$$%X..\$$%X.\n", 0x$(APP_ENTRY), 0x$(APP_ENTRY) + (-s "$(PROG).app") - 1);'
# Prerequisites.
$(CARDGAME_LIB_DIR)/pmode4game.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
$(NON_GEN_OBJ): $(NON_GEN_HEADERS) $(GEN_HEADERS) $(CARDGAME_LIB_DIR)/pmode4game.h $(DECBFILE_LIB_DIR)/runDOSLoader.h
# A source library override contributes its own headers to the dependency graph.
$(NON_GEN_OBJ): $(NON_GEN_HEADERS) $(GEN_HEADERS) $(addsuffix /pmode4game.h,$(CARDGAME_LIB_DIR)) $(addsuffix /runDOSLoader.h,$(DECBFILE_LIB_DIR))
$(GEN_OBJ): cocosmash.h