|
Line
Link Here
|
| 0 |
-- sauerbraten/src/Makefile |
0 |
++ sauerbraten/src/Makefile |
|
Lines 4-10
override CXXFLAGS+= -Wall -fsigned-char
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 20-27
WINDRES= windres
Link Here
|
| 20 |
CLIENT_INCLUDES= $(INCLUDES) -Iinclude |
20 |
CLIENT_INCLUDES= $(INCLUDES) -Iinclude |
| 21 |
CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm |
21 |
CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm |
| 22 |
else |
22 |
else |
| 23 |
CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` |
23 |
CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags` |
| 24 |
CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL |
24 |
CLIENT_LIBS= -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL |
| 25 |
endif |
25 |
endif |
| 26 |
ifeq ($(PLATFORM),Linux) |
26 |
ifeq ($(PLATFORM),Linux) |
| 27 |
CLIENT_LIBS+= -lrt |
27 |
CLIENT_LIBS+= -lrt |
|
Lines 91-97
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES
Link Here
|
| 91 |
SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm |
91 |
SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm |
| 92 |
else |
92 |
else |
| 93 |
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) |
93 |
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) |
| 94 |
SERVER_LIBS= -Lenet/.libs -lenet -lz |
94 |
SERVER_LIBS= -lenet -lz |
| 95 |
endif |
95 |
endif |
| 96 |
SERVER_OBJS= \ |
96 |
SERVER_OBJS= \ |
| 97 |
shared/crypto-standalone.o \ |
97 |
shared/crypto-standalone.o \ |
|
Lines 116-130
default: all
Link Here
|
| 116 |
|
116 |
|
| 117 |
all: client server |
117 |
all: client server |
| 118 |
|
118 |
|
| 119 |
enet/Makefile: |
|
|
| 120 |
cd enet; ./configure --enable-shared=no --enable-static=yes |
| 121 |
|
| 122 |
libenet: enet/Makefile |
| 123 |
$(MAKE) -C enet/ all |
| 124 |
|
| 125 |
clean-enet: enet/Makefile |
| 126 |
$(MAKE) -C enet/ clean |
| 127 |
|
| 128 |
clean: |
119 |
clean: |
| 129 |
-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master |
120 |
-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master |
| 130 |
|
121 |
|
|
Lines 159-171
master: $(MASTER_OBJS)
Link Here
|
| 159 |
|
150 |
|
| 160 |
install: all |
151 |
install: all |
| 161 |
else |
152 |
else |
| 162 |
client: libenet $(CLIENT_OBJS) |
153 |
client: $(CLIENT_OBJS) |
| 163 |
$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) |
154 |
$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) |
| 164 |
|
155 |
|
| 165 |
server: libenet $(SERVER_OBJS) |
156 |
server: $(SERVER_OBJS) |
| 166 |
$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) |
157 |
$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) |
| 167 |
|
158 |
|
| 168 |
master: libenet $(MASTER_OBJS) |
159 |
master: $(MASTER_OBJS) |
| 169 |
$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(SERVER_LIBS) |
160 |
$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(SERVER_LIBS) |
| 170 |
|
161 |
|
| 171 |
install: all |
162 |
install: all |
