View | Details | Raw Unified | Return to bug 119813
Collapse All | Expand All

(-)./Makefile (-1 / +1 lines)
Lines 25-31 Link Here
25 
OPTIONS=	CLIENT "Build client" on \
 25 
OPTIONS=	CLIENT "Build client" on \
26 
		CELLSHADING "Enable Cell Shading effect" off \
 26 
		CELLSHADING "Enable Cell Shading effect" off \
27 
		CURL "Enable curl support" on \
 27 
		CURL "Enable curl support" on \
28 
		CURL_DLOPEN "Enable dynamic loading of curl" on \
 28 
		CURL_DLOPEN "Enable dynamic loading of curl (broken?)" off \
29 
		GAMELIBS "Build game libraries (when not mandatory)" off \
 29 
		GAMELIBS "Build game libraries (when not mandatory)" off \
30 
		DEDICATED "Build dedicated server" on \
 30 
		DEDICATED "Build dedicated server" on \
31 
		MP3 "Enable MP3 support" off \
 31 
		MP3 "Enable MP3 support" off \
(-)./files/patch-Makefile (-18 / +35 lines)
Lines 1-5 Link Here
1 
--- Makefile.orig	Sun Dec 16 18:09:18 2007
 1 
--- Makefile.orig	2008-01-19 15:13:14.000000000 -0800
2 
+++ Makefile	Fri Jan  4 10:40:41 2008
 2 
+++ Makefile	2008-01-19 15:13:28.000000000 -0800
3 
@@ -27,16 +27,22 @@
 3 
@@ -27,16 +27,22 @@
4 
   endif
 4 
   endif
5 
 endif
 5 
 endif
Lines 128-134 Link Here
128
128
129 
   ifeq ($(USE_OPENAL),1)
 129 
   ifeq ($(USE_OPENAL),1)
130 
     BASE_CFLAGS += -DUSE_OPENAL=1
 130 
     BASE_CFLAGS += -DUSE_OPENAL=1
131 
@@ -520,45 +504,61 @@
 131 
@@ -516,49 +500,78 @@
132 
     endif
133 
   endif
134
135 
+  ifeq ($(USE_CURL),1)
136 
+    BASE_CFLAGS += -DUSE_CURL=1
137 
+    ifeq ($(USE_CURL_DLOPEN),1)
138 
+      BASE_CFLAGS += -DUSE_CURL_DLOPEN=1
139 
+    endif
140 
+  endif
141 
+
142 
   ifeq ($(USE_CODEC_VORBIS),1)
132 
     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
 143 
     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
133 
   endif
 144 
   endif
134
145
Lines 208-217 Link Here
208 
     ifneq ($(USE_OPENAL_DLOPEN),1)
 219 
     ifneq ($(USE_OPENAL_DLOPEN),1)
209 
-      CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lopenal
 220 
-      CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lopenal
210 
+      CLIENT_LDFLAGS += -lopenal
 221 
+      CLIENT_LDFLAGS += -lopenal
222 
+    endif
223 
+  endif
224 
+
225 
+  ifeq ($(USE_CURL),1)
226 
+    ifneq ($(USE_CURL_DLOPEN),1)
227 
+      CLIENT_LDFLAGS += -lcurl
211 
     endif
 228 
     endif
212 
   endif
 229 
   endif
213
230
214 
@@ -566,7 +566,6 @@
 231 
@@ -566,7 +579,6 @@
215 
     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
 232 
     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
216 
   endif
 233 
   endif
217
234
Lines 219-225 Link Here
219 
 else # ifeq freebsd
 236 
 else # ifeq freebsd
220
237
221 
 #############################################################################
 238 
 #############################################################################
222 
@@ -717,24 +716,25 @@
 239 
@@ -717,24 +729,25 @@
223 
 TARGETS =
 240 
 TARGETS =
224
241
225 
 ifneq ($(BUILD_SERVER),0)
 242 
 ifneq ($(BUILD_SERVER),0)
Lines 256-262 Link Here
256 
 endif
 273 
 endif
257
274
258 
 ifneq ($(BUILD_GAME_QVM),0)
 275 
 ifneq ($(BUILD_GAME_QVM),0)
259 
@@ -824,10 +824,10 @@
 276 
@@ -824,10 +837,10 @@
260 
 all: debug release
 277 
 all: debug release
261
278
262 
 debug:
 279 
 debug:
Lines 269-275 Link Here
269
286
270 
 # Create the build directories and tools, print out
 287 
 # Create the build directories and tools, print out
271 
 # an informational message, then start building
 288 
 # an informational message, then start building
272 
@@ -880,7 +880,7 @@
 289 
@@ -880,7 +893,7 @@
273 
 Q3LCC=$(TOOLSDIR)/q3lcc$(BINEXT)
 290 
 Q3LCC=$(TOOLSDIR)/q3lcc$(BINEXT)
274 
 Q3ASM=$(TOOLSDIR)/q3asm$(BINEXT)
 291 
 Q3ASM=$(TOOLSDIR)/q3asm$(BINEXT)
275
292
Lines 278-284 Link Here
278 
 tools:
 295 
 tools:
279 
 	@echo QVM tools not built when cross-compiling
 296 
 	@echo QVM tools not built when cross-compiling
280 
 else
 297 
 else
281 
@@ -943,8 +943,13 @@
 298 
@@ -943,8 +956,13 @@
282 
   $(B)/client/snd_main.o \
 299 
   $(B)/client/snd_main.o \
283 
   $(B)/client/snd_codec.o \
 300 
   $(B)/client/snd_codec.o \
284 
   $(B)/client/snd_codec_wav.o \
 301 
   $(B)/client/snd_codec_wav.o \
Lines 294-300 Link Here
294 
   $(B)/client/qal.o \
 311 
   $(B)/client/qal.o \
295 
   $(B)/client/snd_openal.o \
 312 
   $(B)/client/snd_openal.o \
296 
   \
 313 
   \
297 
@@ -1078,9 +1083,15 @@
 314 
@@ -1078,9 +1096,15 @@
298 
   ifeq ($(ARCH),x86)
 315 
   ifeq ($(ARCH),x86)
299 
     Q3OBJ += $(B)/client/vm_x86.o
 316 
     Q3OBJ += $(B)/client/vm_x86.o
300 
   endif
 317 
   endif
Lines 310-316 Link Here
310 
   ifeq ($(ARCH),ppc)
 327 
   ifeq ($(ARCH),ppc)
311 
     Q3OBJ += $(B)/client/vm_ppc.o
 328 
     Q3OBJ += $(B)/client/vm_ppc.o
312 
   endif
 329 
   endif
313 
@@ -1113,7 +1124,7 @@
 330 
@@ -1113,7 +1137,7 @@
314
331
315 
   ifeq ($(USE_SDL),1)
 332 
   ifeq ($(USE_SDL),1)
316 
     ifneq ($(PLATFORM),darwin)
 333 
     ifneq ($(PLATFORM),darwin)
Lines 319-325 Link Here
319 
     endif
 336 
     endif
320 
   endif
 337 
   endif
321
338
322 
@@ -1126,12 +1137,12 @@
 339 
@@ -1126,12 +1150,12 @@
323 
     $(B)/clientsmp/sdl_glimp.o
 340 
     $(B)/clientsmp/sdl_glimp.o
324 
 endif
 341 
 endif
325
342
Lines 334-340 Link Here
334 
 	$(echo_cmd) "LD $@"
 351 
 	$(echo_cmd) "LD $@"
335 
 	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
 352 
 	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
336 
 		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
 353 
 		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
337 
@@ -1248,7 +1259,7 @@
 354 
@@ -1248,7 +1272,7 @@
338 
   endif
 355 
   endif
339 
 endif
 356 
 endif
340
357
Lines 343-349 Link Here
343 
 	$(echo_cmd) "LD $@"
 360 
 	$(echo_cmd) "LD $@"
344 
 	$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
 361 
 	$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
345
362
346 
@@ -1287,7 +1298,7 @@
 363 
@@ -1287,7 +1311,7 @@
347 
 Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
 364 
 Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
348 
 Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
 365 
 Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
349
366
Lines 352-358 Link Here
352 
 	$(echo_cmd) "LD $@"
 369 
 	$(echo_cmd) "LD $@"
353 
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
 370 
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
354
371
355 
@@ -1330,7 +1341,7 @@
 372 
@@ -1330,7 +1354,7 @@
356 
 MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
 373 
 MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
357 
 MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
 374 
 MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
358
375
Lines 361-367 Link Here
361 
 	$(echo_cmd) "LD $@"
 378 
 	$(echo_cmd) "LD $@"
362 
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
 379 
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
363
380
364 
@@ -1382,7 +1393,7 @@
 381 
@@ -1382,7 +1406,7 @@
365 
 Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
 382 
 Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
366 
 Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
 383 
 Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
367
384
Lines 370-376 Link Here
370 
 	$(echo_cmd) "LD $@"
 387 
 	$(echo_cmd) "LD $@"
371 
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
 388 
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
372
389
373 
@@ -1432,7 +1443,7 @@
 390 
@@ -1432,7 +1456,7 @@
374 
 MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
 391 
 MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
375 
 MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
 392 
 MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
376
393
Lines 379-385 Link Here
379 
 	$(echo_cmd) "LD $@"
 396 
 	$(echo_cmd) "LD $@"
380 
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
 397 
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
381
398
382 
@@ -1494,7 +1505,7 @@
 399 
@@ -1494,7 +1518,7 @@
383 
 Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
 400 
 Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
384 
 Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
 401 
 Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
385
402
Lines 388-394 Link Here
388 
 	$(echo_cmd) "LD $@"
 405 
 	$(echo_cmd) "LD $@"
389 
 	$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
 406 
 	$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
390
407
391 
@@ -1521,7 +1532,7 @@
 408 
@@ -1521,7 +1545,7 @@
392 
 MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
 409 
 MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
393 
 MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
 410 
 MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm

Return to bug 119813