Created
June 1, 2024 12:27
-
-
Save ao-kenji/668b0663f1bc009aed2869eee7657df4 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile b/Makefile | |
index 01f02a31a..038038abc 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -88,7 +88,7 @@ | |
# zx+3: ZX Spectrum +3 | |
# zxdiv: ZX Spectrum 128K with DivIDE/DivMMC interface | |
-TARGET=rc2014 | |
+TARGET=z80pack | |
include version.mk | |
@@ -108,7 +108,7 @@ PATH := /opt/fcc/bin:$(PATH) | |
PATH := $(FUZIX_ROOT)/Build/tools/:$(PATH) | |
# Use Berkeley yacc always (Bison output is too large) | |
-YACC = byacc | |
+YACC = yacc | |
# TARGET is what we are building | |
# CPU is the CPU type for the kernel | |
diff --git a/Standalone/Makefile b/Standalone/Makefile | |
index ff5f34078..e67df4923 100644 | |
--- a/Standalone/Makefile | |
+++ b/Standalone/Makefile | |
@@ -1,4 +1,4 @@ | |
-CC=gcc | |
+CC=cc | |
#Use this for playing with the experimental libdsk support | |
#CCOPTS=-O2 -DLIBDSK -ldsk -g -Wall -pedantic -Wno-char-subscripts -Wno-deprecated-declarations | |
CCOPTS=-O2 -g -Wall -pedantic -Wno-char-subscripts -Wno-deprecated-declarations | |
diff --git a/Standalone/mkftl.c b/Standalone/mkftl.c | |
index a1825eb14..83afe4a67 100644 | |
--- a/Standalone/mkftl.c | |
+++ b/Standalone/mkftl.c | |
@@ -11,6 +11,10 @@ | |
#include "../Kernel/lib/dhara/map.h" | |
#include "../Kernel/lib/dhara/nand.h" | |
+#if defined(__clang__) | |
+#define ffsl __builtin_ffsl | |
+#endif | |
+ | |
static uint32_t pagesize = 512; | |
static uint32_t erasesize = 4096; | |
static uint32_t flashsize = 1024*1024; /* bytes */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment