|
Lines 344-354
Link Here
|
| 344 |
endif |
344 |
endif |
| 345 |
|
345 |
|
| 346 |
ifeq ($(USE_CIN_THEORA),1) |
346 |
ifeq ($(USE_CIN_THEORA),1) |
| 347 |
CLIENT_LDFLAGS += -ltheora |
347 |
CLIENT_LIBS += -ltheora |
| 348 |
endif |
348 |
endif |
| 349 |
|
349 |
|
| 350 |
ifeq ($(USE_CODEC_MP3),1) |
350 |
ifeq ($(USE_CODEC_MP3),1) |
| 351 |
CLIENT_LDFLAGS += -lmad |
351 |
CLIENT_LIBS += -lmad |
| 352 |
endif |
352 |
endif |
| 353 |
|
353 |
|
| 354 |
ifeq ($(USE_CURL),1) |
354 |
ifeq ($(USE_CURL),1) |
|
Lines 380-391
Link Here
|
| 380 |
|
380 |
|
| 381 |
ifeq ($(USE_CIN_THEORA),1) |
381 |
ifeq ($(USE_CIN_THEORA),1) |
| 382 |
BASE_CFLAGS += -DUSE_CIN_THEORA |
382 |
BASE_CFLAGS += -DUSE_CIN_THEORA |
| 383 |
CLIENT_LDFLAGS += -ltheora |
383 |
CLIENT_LIBS += -ltheora |
| 384 |
endif |
384 |
endif |
| 385 |
|
385 |
|
| 386 |
ifeq ($(USE_CODEC_MP3),1) |
386 |
ifeq ($(USE_CODEC_MP3),1) |
| 387 |
BASE_CFLAGS += -DUSE_CODEC_MP3 |
387 |
BASE_CFLAGS += -DUSE_CODEC_MP3 |
| 388 |
CLIENT_LDFLAGS += -lmad |
388 |
CLIENT_LIBS += -lmad |
| 389 |
endif |
389 |
endif |
| 390 |
else # ifeq Linux |
390 |
else # ifeq Linux |
| 391 |
|
391 |
|
|
Lines 435-446
Link Here
|
| 435 |
|
435 |
|
| 436 |
ifeq ($(USE_CIN_THEORA),1) |
436 |
ifeq ($(USE_CIN_THEORA),1) |
| 437 |
BASE_CFLAGS += -DUSE_CIN_THEORA |
437 |
BASE_CFLAGS += -DUSE_CIN_THEORA |
| 438 |
CLIENT_LDFLAGS += -ltheora |
438 |
CLIENT_LIBS += -ltheora |
| 439 |
endif |
439 |
endif |
| 440 |
|
440 |
|
| 441 |
ifeq ($(USE_CODEC_MP3),1) |
441 |
ifeq ($(USE_CODEC_MP3),1) |
| 442 |
BASE_CFLAGS += -DUSE_CODEC_MP3 |
442 |
BASE_CFLAGS += -DUSE_CODEC_MP3 |
| 443 |
CLIENT_LDFLAGS += -lmad |
443 |
CLIENT_LIBS += -lmad |
| 444 |
endif |
444 |
endif |
| 445 |
|
445 |
|
| 446 |
BASE_CFLAGS += -D_THREAD_SAFE=1 |
446 |
BASE_CFLAGS += -D_THREAD_SAFE=1 |
|
Lines 565-571
Link Here
|
| 565 |
endif |
565 |
endif |
| 566 |
|
566 |
|
| 567 |
ifeq ($(USE_CODEC_MP3),1) |
567 |
ifeq ($(USE_CODEC_MP3),1) |
| 568 |
CLIENT_LDFLAGS += -lmad |
568 |
CLIENT_LIBS += -lmad |
| 569 |
endif |
569 |
endif |
| 570 |
|
570 |
|
| 571 |
ifeq ($(ARCH),x86) |
571 |
ifeq ($(ARCH),x86) |
|
Lines 662-672
Link Here
|
| 662 |
endif |
662 |
endif |
| 663 |
|
663 |
|
| 664 |
ifeq ($(USE_CIN_THEORA),1) |
664 |
ifeq ($(USE_CIN_THEORA),1) |
| 665 |
CLIENT_LDFLAGS += -ltheora |
665 |
CLIENT_LIBS += -ltheora |
| 666 |
endif |
666 |
endif |
| 667 |
|
667 |
|
| 668 |
ifeq ($(USE_CODEC_MP3),1) |
668 |
ifeq ($(USE_CODEC_MP3),1) |
| 669 |
CLIENT_LDFLAGS += -lmad |
669 |
CLIENT_LIBS += -lmad |
| 670 |
endif |
670 |
endif |
| 671 |
|
671 |
|
| 672 |
# cross-compiling tweaks |
672 |
# cross-compiling tweaks |
|
Lines 732-742
Link Here
|
| 732 |
endif |
732 |
endif |
| 733 |
|
733 |
|
| 734 |
ifeq ($(USE_CIN_THEORA),1) |
734 |
ifeq ($(USE_CIN_THEORA),1) |
| 735 |
CLIENT_LDFLAGS += -ltheora |
735 |
CLIENT_LIBS += -ltheora |
| 736 |
endif |
736 |
endif |
| 737 |
|
737 |
|
| 738 |
ifeq ($(USE_CODEC_MP3),1) |
738 |
ifeq ($(USE_CODEC_MP3),1) |
| 739 |
CLIENT_LDFLAGS += -lmad |
739 |
CLIENT_LIBS += -lmad |
| 740 |
endif |
740 |
endif |
| 741 |
|
741 |
|
| 742 |
ifeq ($(USE_CURL),1) |
742 |
ifeq ($(USE_CURL),1) |
|
Lines 1780-1786
Link Here
|
| 1780 |
|
1780 |
|
| 1781 |
$(B)/wop-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
1781 |
$(B)/wop-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
| 1782 |
$(echo_cmd) "LD $@" |
1782 |
$(echo_cmd) "LD $@" |
| 1783 |
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \ |
1783 |
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \ |
| 1784 |
-o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) \ |
1784 |
-o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) \ |
| 1785 |
$(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) |
1785 |
$(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) |
| 1786 |
endif |
1786 |
endif |
