--- src/Makefile.orig 2012-08-28 05:30:07 UTC +++ src/Makefile @@ -1,8 +1,7 @@ -CXXFLAGS= -O3 -fomit-frame-pointer override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti PLATFORM= $(shell uname -s) -PLATFORM_PREFIX= native +PLATFORM_PREFIX= FreeBSD INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include @@ -36,8 +35,8 @@ STD_LIBS= -static-libgcc -static-libstdc endif CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm else -CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` -CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL +CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include +CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lX11 -lSDL_image -lSDL_mixer -lz -lGL endif ifeq ($(PLATFORM),Linux) CLIENT_LIBS+= -lrt @@ -98,15 +97,13 @@ CLIENT_OBJS= \ 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/.libs -lenet -lz +SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include +SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib MASTER_LIBS= $(SERVER_LIBS) endif SERVER_OBJS= \