Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 111566 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-17 / +8 lines)
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 18-25 Link Here
18
CLIENT_INCLUDES= $(INCLUDES) -Iinclude
18
CLIENT_INCLUDES= $(INCLUDES) -Iinclude
19
CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
19
CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
20
else	
20
else	
21
CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
21
CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags`
22
CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
22
CLIENT_LIBS= -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
23
endif
23
endif
24
ifeq ($(PLATFORM),Linux)
24
ifeq ($(PLATFORM),Linux)
25
CLIENT_LIBS+= -lrt
25
CLIENT_LIBS+= -lrt
Lines 89-95 Link Here
89
SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
89
SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
90
else
90
else
91
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
91
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
92
SERVER_LIBS= -Lenet -lenet -lz
92
SERVER_LIBS= -lenet -lz
93
endif
93
endif
94
SERVER_OBJS= \
94
SERVER_OBJS= \
95
	shared/crypto-standalone.o \
95
	shared/crypto-standalone.o \
Lines 114-128 Link Here
114
114
115
all: client server
115
all: client server
116
116
117
enet/Makefile:
118
	cd enet; ./configure
119
	
120
libenet: enet/Makefile
121
	$(MAKE)	-C enet/ all
122
123
clean-enet: enet/Makefile
124
	$(MAKE) -C enet/ clean
125
126
clean:
117
clean:
127
	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
118
	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
128
119
Lines 157-169 Link Here
157
148
158
install: all
149
install: all
159
else
150
else
160
client:	libenet $(CLIENT_OBJS)
151
client:	$(CLIENT_OBJS)
161
	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
152
	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
162
153
163
server:	libenet $(SERVER_OBJS)
154
server:	$(SERVER_OBJS)
164
	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
155
	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
165
	
156
	
166
master: libenet $(MASTER_OBJS)
157
master: $(MASTER_OBJS)
167
	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(SERVER_LIBS)  
158
	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(SERVER_LIBS)  
168
159
169
install: all
160
install: all

Return to bug 111566