From 9d58e2ead236b490dceb8eb17411e345cdf1aa27 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Wed, 10 Nov 2021 13:44:21 -0500 Subject: [PATCH] Mac buildfixes --- game/Makefile | 9 ++++++++- game/acesrc/acebot_compress.c | 4 +++- game/g_fog.c | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/game/Makefile b/game/Makefile index b4444a3..6254761 100644 --- a/game/Makefile +++ b/game/Makefile @@ -1,6 +1,13 @@ # Makefile for Thirty Flights of Loving Game DLL # Written by Ethan "flibitijibibo" Lee +ifeq ($(shell uname), Darwin) + SUFFIX = dylib +else + SUFFIX = so + LDFLAGS := -Wl,--no-undefined +endif + TFOL_SRC = \ g_abel_camshoot.c \ g_abel_civspawner.c \ @@ -90,7 +97,7 @@ TFOL_SRC = \ acesrc/acebot_spawn.c all: - $(CC) -o baseq2/kmq2gamex86_64.so -g -w -Wl,--no-undefined -fpic -fPIC -shared $(TFOL_SRC) -lSDL2 -lm + $(CC) -o baseq2/kmq2gamex86_64.$(SUFFIX) -g -w $(LDFLAGS) -fpic -fPIC -shared $(TFOL_SRC) -lSDL2 -lm cp ../../kmquake2-tfol/quake2/kmquake2 . clean: diff --git a/game/acesrc/acebot_compress.c b/game/acesrc/acebot_compress.c index 8d81a38..b3963d3 100644 --- a/game/acesrc/acebot_compress.c +++ b/game/acesrc/acebot_compress.c @@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#ifndef __APPLE__ #include +#endif #define N 4096 /* size of ring buffer */ #define F 18 /* upper limit for match_length */ @@ -306,4 +308,4 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } -*/ \ No newline at end of file +*/ diff --git a/game/g_fog.c b/game/g_fog.c index 2a1b9c4..19b4854 100644 --- a/game/g_fog.c +++ b/game/g_fog.c @@ -123,7 +123,11 @@ OLD FOG SYSTEM #include #endif #define __MSC__ +#ifdef __APPLE__ +#include +#else #include +#endif fog_t gfogs[MAX_FOGS];