|
Line
Link Here
|
| 0 |
-- sauerbraten/src/Makefile |
0 |
++ sauerbraten/src/Makefile |
|
Lines 4-10
Link Here
|
| 4 |
PLATFORM= $(shell uname -s) |
4 |
PLATFORM= $(shell uname -s) |
| 5 |
PLATFORM_PREFIX= native |
5 |
PLATFORM_PREFIX= native |
| 6 |
|
6 |
|
| 7 |
INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include |
7 |
INCLUDES= -Ishared -Iengine -Ifpsgame |
| 8 |
|
8 |
|
| 9 |
STRIP= |
9 |
STRIP= |
| 10 |
ifeq (,$(findstring -g,$(CXXFLAGS))) |
10 |
ifeq (,$(findstring -g,$(CXXFLAGS))) |
|
Lines 36-43
Link Here
|
| 36 |
endif |
36 |
endif |
| 37 |
CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm |
37 |
CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm |
| 38 |
else |
38 |
else |
| 39 |
CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` |
39 |
CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags` |
| 40 |
CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL |
40 |
CLIENT_LIBS= -lenet -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL |
| 41 |
endif |
41 |
endif |
| 42 |
ifeq ($(PLATFORM),Linux) |
42 |
ifeq ($(PLATFORM),Linux) |
| 43 |
CLIENT_LIBS+= -lrt |
43 |
CLIENT_LIBS+= -lrt |
|
Lines 106-112
Link Here
|
| 106 |
MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm |
106 |
MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm |
| 107 |
else |
107 |
else |
| 108 |
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) |
108 |
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) |
| 109 |
SERVER_LIBS= -Lenet/.libs -lenet -lz |
109 |
SERVER_LIBS= -lenet -lz |
| 110 |
MASTER_LIBS= $(SERVER_LIBS) |
110 |
MASTER_LIBS= $(SERVER_LIBS) |
| 111 |
endif |
111 |
endif |
| 112 |
SERVER_OBJS= \ |
112 |
SERVER_OBJS= \ |
|
Lines 135-149
Link Here
|
| 135 |
|
135 |
|
| 136 |
all: client server |
136 |
all: client server |
| 137 |
|
137 |
|
| 138 |
enet/Makefile: |
|
|
| 139 |
cd enet; ./configure --enable-shared=no --enable-static=yes |
| 140 |
|
| 141 |
libenet: enet/Makefile |
| 142 |
$(MAKE) -C enet/ all |
| 143 |
|
| 144 |
clean-enet: enet/Makefile |
| 145 |
$(MAKE) -C enet/ clean |
| 146 |
|
| 147 |
clean: |
138 |
clean: |
| 148 |
-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master |
139 |
-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master |
| 149 |
|
140 |
|
|
Lines 176-188
Link Here
|
| 176 |
|
167 |
|
| 177 |
install: all |
168 |
install: all |
| 178 |
else |
169 |
else |
| 179 |
client: libenet $(CLIENT_OBJS) |
170 |
client: $(CLIENT_OBJS) |
| 180 |
$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) |
171 |
$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) |
| 181 |
|
172 |
|
| 182 |
server: libenet $(SERVER_OBJS) |
173 |
server: $(SERVER_OBJS) |
| 183 |
$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) |
174 |
$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) |
| 184 |
|
175 |
|
| 185 |
master: libenet $(MASTER_OBJS) |
176 |
master: $(MASTER_OBJS) |
| 186 |
$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) |
177 |
$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) |
| 187 |
|
178 |
|
| 188 |
shared/cube2font.o: shared/cube2font.c |
179 |
shared/cube2font.o: shared/cube2font.c |
