github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mac compilation

Browse source
This commit is contained in:
David Chavez 2022-06-03 01:28:30 +02:00
commit de4f2fb3f4
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libultraship/Makefile
View file

@ -17,7 +17,8 @@ WARN := -Wall -Wextra -Werror \
-Wno-unused-function \ -Wno-unused-function \
-Wno-parentheses \ -Wno-parentheses \
-Wno-narrowing \ -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 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 CFLAGS := $(WARN) -std=c99 -D_GNU_SOURCE -DENABLE_OPENGL -DSPDLOG_ACTIVE_LEVEL=0
@ -77,6 +78,7 @@ LIB := libultraship.a
INC_DIRS := $(addprefix -I, \ INC_DIRS := $(addprefix -I, \
../ZAPDTR/ZAPDUtils \ ../ZAPDTR/ZAPDUtils \
../StormLib/src \
libultraship/Lib/Fast3D/U64 \ libultraship/Lib/Fast3D/U64 \
libultraship/Lib/spdlog \ libultraship/Lib/spdlog \
libultraship/Lib/spdlog/include \ libultraship/Lib/spdlog/include \

2
soh/src/code/audio_load.c
View file

@ -575,7 +575,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
while (numFonts > 0) { while (numFonts > 0) {
fontId = gAudioContext.sequenceFontTable[index++]; fontId = gAudioContext.sequenceFontTable[index++];
// if (gUseLegacySD) if (gUseLegacySD)
AudioLoad_SyncLoadFont(fontId); AudioLoad_SyncLoadFont(fontId);
numFonts--; numFonts--;