Skip to content

Commit 81213f7

Browse files
authored
Make fujinet-lib the standard API instead of io_* (#143)
* CoCo compiles * Apple2 compiles * Atari compiles * Adam compiles * C64 compiles * Fix Makefile.pmd85 to use wildcard not find * Restore bar color indicates WiFi is online
1 parent 8e37d9d commit 81213f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+677
-1225
lines changed

Makefile.adam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ADDL_LIB2 := smartkeys.lib
1414
CC=zcc
1515
AS=zcc
1616

17-
SRCS := $(shell find $(SRC_DIRS) -name *.cpp -or -name *.c -or -name *_adam.asm)
17+
SRCS := $(wildcard $(SRC_DIRS)/*.c) $(wildcard $(SRC_DIRS)/adam/*.c)
1818
OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
1919
DEPS := $(OBJS:.o=.d)
2020

Makefile.coco

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ FUJINET_LIB_BASENAME := $(notdir $(FUJINET_LIB_PATH))
2222
FUJINET_LIB_SYMLINK := libfujinet-$(CURRENT_TARGET)-$(FUJINET_LIB_VERSION).lib.a
2323

2424
LIBS=-L $(FUJINET_LIB_VERSION_DIR) -l$(FUJINET_LIB_BASENAME)
25-
CFLAGS=-DUSING_FUJINET_LIB -I$(FUJINET_LIB_VERSION_DIR)
25+
CFLAGS=-DUSING_FUJINET_LIB -I$(FUJINET_LIB_VERSION_DIR) -Wno-assign-in-condition
2626
LIMITFLAGS=--org=0E00 --limit=7C00
2727

28-
OBJS = check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o strendswith.o pause.o
28+
OBJS = check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o system.o mount_and_boot.o screen.o strrchr.o strendswith.o pause.o
2929
$(TARGET_EXEC): $(OBJS)
3030
$(CC) $(LIMITFLAGS) -o $@ $^ $(LIBS)
3131

Makefile.pmd85

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SRC_DIRS ?= ./src
66
CC=zcc
77
AS=zcc
88

9-
SRCS := $(shell find $(SRC_DIRS) -name *.cpp -or -name *.c -or -name *_pmd85.asm)
9+
SRCS := $(wildcard $(SRC_DIRS)/*.c) $(wildcard $(SRC_DIRS)/pmd85/*.c)
1010
OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
1111
DEPS := $(OBJS:.o=.d)
1212

0 commit comments

Comments
 (0)