--- src/Makefile 2020-12-04 14:55:54.000000000 -0500 +++ src/Makefile 2020-12-28 19:53:06.567185000 -0500 @@ -1,8 +1,7 @@ -CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti -PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]') -PLATFORM_PREFIX= native +PLATFORM= $(shell uname -s) +PLATFORM_PREFIX= FreeBSD INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include @@ -65,8 +64,8 @@ CLIENT_LIBS+= -framework SDL2_mixer -framework CoreAudio -framework AudioToolbox CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -Lenet -lenet else -CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags` -CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL +CLIENT_INCLUDES= $(INCLUDES) `${SDL2_CONFIG} --cflags` -I${LOCALBASE}/include +CLIENT_LIBS= -Lenet -lenet `${SDL2_CONFIG} --libs` -L${LOCALBASE}/lib -lX11 -lSDL2_image -lSDL2_mixer -lz -lGL endif endif ifeq ($(PLATFORM),LINUX) @@ -133,15 +132,13 @@ fpsgame/waypoint.o \ fpsgame/weapon.o -CLIENT_PCH= shared/cube.h.gch engine/engine.h.gch fpsgame/game.h.gch - ifneq (,$(findstring MINGW,$(PLATFORM))) SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm else -SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -SERVER_LIBS= -Lenet -lenet -lz +SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include +SERVER_LIBS= -Lenet -lenet -lz -L${LOCALBASE}/lib MASTER_LIBS= $(SERVER_LIBS) endif SERVER_OBJS= \