From d6af9ae4f64b6e8ccbf7491af9516f409b25b2be Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Tue, 13 Feb 2024 17:49:36 -0600 Subject: [PATCH] Tweaked the build a bit for the F256. --- include/story.h | 2 +- ports/dos-like/CMakeLists.txt | 2 +- ports/f256/build.sh | 5 +++-- ports/f256/f256zip.c | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/story.h b/include/story.h index ea70a78..13465b0 100644 --- a/include/story.h +++ b/include/story.h @@ -80,7 +80,7 @@ #define storyVersion() portByteGet(0x0) #define storyFlags() portByteGet(STORY_FLAG_V3) -#define storyHightMemory() portWordGet(0x4) +#define storyHighMemory() portWordGet(0x4) #define storyInitialPC() portWordGet(0x6) // V1-5 #define storyInitialPackedPC() memoryUnpackAddress(portWordGet(0x6), MEMORY_ROUTINE) // V6 #define storyDictionaryAddress() portWordGet(0x8) diff --git a/ports/dos-like/CMakeLists.txt b/ports/dos-like/CMakeLists.txt index d283e07..b995b1f 100644 --- a/ports/dos-like/CMakeLists.txt +++ b/ports/dos-like/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.12) -project(dos-like-zip LANGUAGES C) +project(muddle LANGUAGES C) find_package(SDL2 REQUIRED) diff --git a/ports/f256/build.sh b/ports/f256/build.sh index 8be75ec..8873c81 100755 --- a/ports/f256/build.sh +++ b/ports/f256/build.sh @@ -38,10 +38,11 @@ pushd .builddir ${F256}/overlayhelper ../../../src/ui.c > overlay.ld ${F256}/overlayhelper ../f256zip.c >> overlay.ld -${CLANG} -c ${F256}/f256lib/f256.c +#${CLANG} -c ${F256}/f256lib/f256.c ${CLANG} -c ../../zip.c ${CLANG} -c ../f256zip.c -${CLANG} -T../f256.ld -o ${PROJECT} zip.o f256.o f256zip.o +#${CLANG} -T../f256.ld -o ${PROJECT} zip.o f256.o f256zip.o +${CLANG} -T../f256.ld -o ${PROJECT} zip.o f256zip.o llvm-nm ${PROJECT}.elf > ${PROJECT}.lst llvm-objdump -d --print-imm-hex ${PROJECT}.elf > ${PROJECT}.lst diff --git a/ports/f256/f256zip.c b/ports/f256/f256zip.c index b7feeba..c6672b2 100644 --- a/ports/f256/f256zip.c +++ b/ports/f256/f256zip.c @@ -37,6 +37,7 @@ #define WITHOUT_GRAPHICS #include "f256.h" +#include "f256.c" #include "portme.h" #include "lib.h"