--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- sauerbraten/src/Makefile +++ sauerbraten/src/Makefile @@ -4,7 +4,7 @@ PLATFORM= $(shell uname -s) PLATFORM_PREFIX= native -INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include +INCLUDES= -Ishared -Iengine -Ifpsgame STRIP= ifeq (,$(findstring -g,$(CXXFLAGS))) @@ -18,8 +18,8 @@ CLIENT_INCLUDES= $(INCLUDES) -Iinclude CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm else -CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` -CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL +CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags` +CLIENT_LIBS= -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL endif ifeq ($(PLATFORM),Linux) CLIENT_LIBS+= -lrt @@ -89,7 +89,7 @@ SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm else SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -SERVER_LIBS= -Lenet -lenet -lz +SERVER_LIBS= -lenet -lz endif SERVER_OBJS= \ shared/crypto-standalone.o \ @@ -114,15 +114,6 @@ all: client server -enet/Makefile: - cd enet; ./configure - -libenet: enet/Makefile - $(MAKE) -C enet/ all - -clean-enet: enet/Makefile - $(MAKE) -C enet/ clean - clean: -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master @@ -157,13 +148,13 @@ install: all else -client: libenet $(CLIENT_OBJS) +client: $(CLIENT_OBJS) $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) -server: libenet $(SERVER_OBJS) +server: $(SERVER_OBJS) $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) -master: libenet $(MASTER_OBJS) +master: $(MASTER_OBJS) $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(SERVER_LIBS) install: all