--- Makefile.old 2011-07-31 21:38:04.000000000 +0200 +++ Makefile 2011-07-31 21:50:43.000000000 +0200 @@ -5,7 +5,7 @@ PLATFORM= $(shell uname -s) PLATFORM_SUFFIX=_native -INCLUDES= -Ishared -Iengine -Igame -Ienet/include +INCLUDES= -Ishared -Iengine -Igame -I/usr/share/enet/include STRIP= ifeq (,$(findstring -g,$(CXXFLAGS))) @@ -22,7 +22,7 @@ CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm else CLIENT_INCLUDES= -DINTERFACE -DIRC $(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_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL endif ifeq ($(PLATFORM),Linux) CLIENT_LIBS+= -lrt @@ -92,7 +92,7 @@ SERVER_LIBS= -mwindows -Llib -lzdll -lenet -lws2_32 -lwinmm else SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES) -SERVER_LIBS= -Lenet/.libs -lenet -lz +SERVER_LIBS= -lenet -lz endif SERVER_OBJS= \ shared/crypto-standalone.o \ @@ -157,13 +157,13 @@ $(STRIP) ../bin/reserver.exe endif else -client: libenet $(CLIENT_OBJS) +client: $(CLIENT_OBJS) $(CXX) $(CXXFLAGS) -o reclient $(CLIENT_OBJS) $(CLIENT_LIBS) ifneq (,$(STRIP)) $(STRIP) reclient endif -server: libenet $(SERVER_OBJS) +server: $(SERVER_OBJS) $(CXX) $(CXXFLAGS) -o reserver $(SERVER_OBJS) $(SERVER_LIBS) ifneq (,$(STRIP)) $(STRIP) reserver