Skip to content

Commit

Permalink
build: Test against mcu,level,target vars where possible, for clarity
Browse files Browse the repository at this point in the history
  • Loading branch information
keirf committed Jan 29, 2025
1 parent 55f29d1 commit 9f673a8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ OBJS += volume.o
OBJS-$(debug) += console.o
OBJS-$(logfile) += logfile.o

ifeq ($(bl_update),y)
ifeq ($(target),bl_update)

OBJS += bl_update.o
SUBDIRS += display gotek

else ifeq ($(io_test),y)
else ifeq ($(target),io_test)

OBJS += io_test.o
SUBDIRS += display gotek

else ifeq ($(bootloader),y)
else ifeq ($(target),bootloader)

OBJS += fw_update.o
SUBDIRS += display fatfs gotek usb
Expand Down
2 changes: 1 addition & 1 deletion src/display/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ OBJS += lcd_$(mcu).o
OBJS += oled_font_6x13.o
OBJS += led_7seg.o

ifneq ($(bootloader),y)
ifneq ($(target),bootloader)
lcd_$(mcu).o: CFLAGS += -Dfont_extra=1
OBJS += oled_font_8x16.o
endif
Expand Down
2 changes: 1 addition & 1 deletion src/image/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ OBJS += image.o

OBJS-$(quickdisk) += qd.o

ifeq ($(apple2),y)
ifeq ($(target),apple2)
shugart := y
endif

Expand Down

0 comments on commit 9f673a8

Please sign in to comment.