Skip to content

Commit e43f432

Browse files
committed
Incorporate fujinet-lib into coco config
1 parent dab2ca6 commit e43f432

File tree

2 files changed

+99
-361
lines changed

2 files changed

+99
-361
lines changed

Makefile.coco

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,48 @@ AS=lwasm
55
CP=cp
66
ECHO=echo
77
FIRMWARE_DIR="../fujinet-firmware"
8+
CURRENT_TARGET := coco
89
TARGET_EXEC=config.bin
910
DISK=autorun.dsk
1011
R2R_DIR=r2r/coco
1112
R2R_BIN=$(R2R_DIR)/$(DISK)
1213

14+
FUJINET_LIB_VERSION = 4.7.9
15+
FUJINET_LIB = fujinet-lib
16+
17+
FUJINET_LIB_VERSION_DIR = $(FUJINET_LIB)/$(FUJINET_LIB_VERSION)-$(CURRENT_TARGET)
18+
FUJINET_LIB_PATH = $(FUJINET_LIB_VERSION_DIR)/fujinet-$(CURRENT_TARGET)-$(FUJINET_LIB_VERSION).lib
19+
FUJINET_LIB_DOWNLOAD_URL = https://github.com/FujiNetWIFI/fujinet-lib/releases/download/v$(FUJINET_LIB_VERSION)/fujinet-lib-$(CURRENT_TARGET)-$(FUJINET_LIB_VERSION).zip
20+
FUJINET_LIB_DOWNLOAD_FILE = $(FUJINET_LIB)/fujinet-lib-$(CURRENT_TARGET)-$(FUJINET_LIB_VERSION).zip
21+
FUJINET_LIB_BASENAME := $(notdir $(FUJINET_LIB_PATH))
22+
FUJINET_LIB_SYMLINK := libfujinet-$(CURRENT_TARGET)-$(FUJINET_LIB_VERSION).lib.a
23+
24+
LIBS=-L $(FUJINET_LIB_VERSION_DIR) -l$(FUJINET_LIB_BASENAME)
25+
CFLAGS=-DUSING_FUJINET_LIB -I$(FUJINET_LIB_VERSION_DIR)
26+
LIMITFLAGS=--org=0E00 --limit=7C00
27+
28+
get_fujinet_lib:
29+
@if [ ! -f "$(FUJINET_LIB_DOWNLOAD_FILE)" ]; then \
30+
if [ -d "$(FUJINET_LIB_VERSION_DIR)" ]; then \
31+
echo "A directory already exists with version $(FUJINET_LIB_VERSION) - please remove it first"; \
32+
exit 1; \
33+
fi; \
34+
HTTPSTATUS=$$(curl -Is $(FUJINET_LIB_DOWNLOAD_URL) | head -n 1 | awk '{print $$2}'); \
35+
if [ "$${HTTPSTATUS}" == "404" ]; then \
36+
echo "ERROR: Unable to find file $(FUJINET_LIB_DOWNLOAD_URL)"; \
37+
exit 1; \
38+
fi; \
39+
echo "Downloading fujinet-lib for $(CURRENT_TARGET) version $(FUJINET_LIB_VERSION) from $(FUJINET_LIB_DOWNLOAD_URL)"; \
40+
mkdir -p $(FUJINET_LIB); \
41+
curl -L $(FUJINET_LIB_DOWNLOAD_URL) -o $(FUJINET_LIB_DOWNLOAD_FILE); \
42+
echo "Unzipping to $(FUJINET_LIB)"; \
43+
unzip -o $(FUJINET_LIB_DOWNLOAD_FILE) -d $(FUJINET_LIB_VERSION_DIR); \
44+
echo "Unzip complete."; \
45+
cd "$(FUJINET_LIB_VERSION_DIR)" && ln -sf "$(FUJINET_LIB_BASENAME)" "$(FUJINET_LIB_SYMLINK)" ; \
46+
fi
47+
1348
$(TARGET_EXEC): 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
14-
$(CC) -o $@ $^
49+
$(CC) $(LIMITFLAGS) -o $@ $^ $(LIBS)
1550

1651
cfgload.bin:
1752
$(AS) -o $@ src/coco/cfgload.asm
@@ -46,3 +81,4 @@ clean:
4681
$(RM) cfgload.bin
4782
$(RM) $(TARGET_EXEC)
4883
$(RM) $(DISK)
84+
$(RM) $(R2R_BIN)

0 commit comments

Comments
 (0)