Skip to content

Fix building apple2 disk, fix GIT_VERSION macro def #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2025
Merged

Fix building apple2 disk, fix GIT_VERSION macro def #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ WITHOUT_PRODOS_BOOT = dist.apple2/bootable.po

apple2/disk-post::
cp $(WITHOUT_PRODOS_BOOT) $(BUILD_DISK)
ac -as $(BUILD_DISK) $(PRODUCT_BASE) < $(BUILD_EXEC)
ac -p $(BUILD_DISK) $(PRODUCT_BASE).SYSTEM SYS 0x2000 < $(CC65_UTILS_DIR)/$(LOADER_SYSTEM)
ac -as $(BUILD_DISK) $(PRODUCT_BASE).SYSTEM < $(BUILD_EXEC)
# ac -p $(BUILD_DISK) $(PRODUCT_BASE).SYSTEM SYS 0x2000 < $(BUILD_EXEC)

########################################
# Atari customization
Expand Down
6 changes: 1 addition & 5 deletions makefiles/common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@ PLATFORM := $(basename $(notdir $(lastword $(PLATFORM_MK))))
PLATFORM_UC := $(shell echo "$(PLATFORM)" | tr '[:lower:]' '[:upper:]')
$(info Building for PLATFORM=$(PLATFORM))

# Add GIT_VERSION macro define to CFLAGS, includes tag if available,
# short commit hash, appends '*' if changes haven't been commited
CFLAGS += -DGIT_VERSION='\"$(shell git rev-parse --short HEAD)$(shell git status --porcelain | grep -q '^[ MADRCU]' && echo '*')\"'

include $(MWD)/../Makefile

# Add GIT_VERSION macro define to CFLAGS, includes tag if available,
# short commit hash, appends '*' if changes haven't been commited
CFLAGS += -DGIT_VERSION='\"$(shell git rev-parse --short HEAD)$(shell git status --porcelain | grep -q '^[ MADRCU]' && echo '*')\"'
CFLAGS += -DGIT_VERSION='"$(shell git rev-parse --short HEAD)$(shell git status --porcelain | grep -q '^[ MADRCU]' && echo '*')"'

IS_LIBRARY := $(if $(filter %.lib,$(PRODUCT)),1,0)
ifeq ($(IS_LIBRARY),1)
Expand Down
1 change: 1 addition & 0 deletions src/apple2/screen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ void screen_show_info_extended(bool printerEnabled, AdapterConfigExtended* acx)
cprintf("%10s%s\r\n","MAC: ",acx->sMacAddress);
cprintf("%10s%s\r\n","BSSID: ",acx->sBssid);
cprintf("%10s%s\r\n","FNVer: ",acx->fn_version);
cprintf("%10s%s\r\n","CONFIG: ",GIT_VERSION);

gotoxy(6,STATUS_BAR);
screen_print_menu("C","hange SSID ");
Expand Down