From 8702a25b4a47ce99d95153bc98d9508661ba85c5 Mon Sep 17 00:00:00 2001 From: Jorj Bauer Date: Sat, 23 Jan 2021 00:45:33 -0500 Subject: [PATCH] fixes for the SDL build --- Makefile | 4 ++-- apple/woz.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 19314dc..c054178 100755 --- a/Makefile +++ b/Makefile @@ -3,8 +3,8 @@ LDFLAGS=-L/usr/local/lib SDLLIBS=-lSDL2 -lpthread FBLIBS=-lpthread -CFLAGS=-Wall -I/usr/include/SDL2 -I .. -I . -I apple -I nix -I sdl -I/usr/local/include/SDL2 -g -DSUPPRESSREALTIME -DSTATICALLOC -CXXFLAGS=-Wall -I/usr/include/SDL2 -I .. -I . -I apple -I nix -I sdl -I/usr/local/include/SDL2 -g -DSUPPRESSREALTIME -DSTATICALLOC +CFLAGS=-Wall -I/usr/include/SDL2 -I .. -I . -I apple -I nix -I sdl -I/usr/local/include/SDL2 -g -DSUPPRESSREALTIME -DSTATICALLOC -DAIIE +CXXFLAGS=-Wall -I/usr/include/SDL2 -I .. -I . -I apple -I nix -I sdl -I/usr/local/include/SDL2 -g -DSUPPRESSREALTIME -DSTATICALLOC -DAIIE TSRC=cpu.cpp util/testharness.cpp diff --git a/apple/woz.cpp b/apple/woz.cpp index 31ac7ee..840bee0 100644 --- a/apple/woz.cpp +++ b/apple/woz.cpp @@ -7,11 +7,14 @@ // Block number we start packing data bits after (Woz 2.0 images) #define STARTBLOCK 3 +#if defined(AIIE) || defined(TEENSYDUINO) +#define LAZYFD +#include "fscompat.h" +#endif + #ifdef TEENSYDUINO // This junk is for my AiiE project. I need to abstract it out better. -#include "fscompat.h" #define SKIPCHECKSUM -#define LAZYFD #define malloc extmem_malloc #define free extmem_free #define calloc extmem_calloc