From de4f2fb3f4da0cef8677db618a76f807bfae8b15 Mon Sep 17 00:00:00 2001
From: David Chavez <david@dcvz.io>
Date: Fri, 3 Jun 2022 01:28:30 +0200
Subject: [PATCH] Fix mac compilation

---
 libultraship/Makefile     | 4 +++-
 soh/src/code/audio_load.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libultraship/Makefile b/libultraship/Makefile
index 5fa6bfe39..b02840463 100644
--- a/libultraship/Makefile
+++ b/libultraship/Makefile
@@ -17,7 +17,8 @@ WARN := -Wall -Wextra -Werror \
 	-Wno-unused-function \
 	-Wno-parentheses \
 	-Wno-narrowing \
-	-Wno-missing-field-initializers
+	-Wno-missing-field-initializers \
+	-Wno-error=multichar
 
 CXXFLAGS := $(WARN) -std=c++20 -D_GNU_SOURCE -DENABLE_OPENGL -DSPDLOG_ACTIVE_LEVEL=0
 CFLAGS := $(WARN) -std=c99 -D_GNU_SOURCE -DENABLE_OPENGL -DSPDLOG_ACTIVE_LEVEL=0
@@ -77,6 +78,7 @@ LIB       := libultraship.a
 
 INC_DIRS := $(addprefix -I, \
 	../ZAPDTR/ZAPDUtils \
+	../StormLib/src \
 	libultraship/Lib/Fast3D/U64 \
 	libultraship/Lib/spdlog \
 	libultraship/Lib/spdlog/include \
diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c
index c068946bd..02b671821 100644
--- a/soh/src/code/audio_load.c
+++ b/soh/src/code/audio_load.c
@@ -575,7 +575,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
     while (numFonts > 0) {
         fontId = gAudioContext.sequenceFontTable[index++];
 
-        // if (gUseLegacySD)
+        if (gUseLegacySD)
             AudioLoad_SyncLoadFont(fontId);
 
         numFonts--;