9ab41ffb0e
The following maintenance operations were performed: - Recreate all patches with `make makepatch` - Add LICENSE - Update MAINTAINER to kami@freebsd.org - games/ioquake3 - Replace a lot of `.if ${PORT_OPTIONS:MFOO}` with `bsd.options.mk` fu - Add support for slaves using different SDL versions - games/ioquake3-devel - Update to GIT revision 2808 - Use SDL2 - games/iourbanterror - Change treatment of patches so `make makepatch` doesn't screw the patches in ${MASTERDIR}/files over - Update 4.2.018 to 4.2.023 - games/urbanterror-data - Update 4.2.018 to 4.2.023 - Fix install without DOCS Reviewed by: cs Approved by: cs Differential Revision: https://reviews.freebsd.org/D5816
70 lines
2.3 KiB
Text
70 lines
2.3 KiB
Text
--- Makefile.orig 2011-12-12 22:48:49 UTC
|
|
+++ Makefile
|
|
@@ -205,6 +205,8 @@ ifneq ($(BUILD_CLIENT),0)
|
|
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
|
|
SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
|
|
SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
|
|
+ VORBIS_CFLAGS=$(shell pkg-config --silence-errors --cflags vorbis vorbisfile)
|
|
+ VORBIS_LIBS=$(shell pkg-config --silence-errors --libs vorbis vorbisfile)
|
|
endif
|
|
# Use sdl-config if all else fails
|
|
ifeq ($(SDL_CFLAGS),)
|
|
@@ -570,9 +572,15 @@ else # ifeq mingw32
|
|
|
|
ifeq ($(PLATFORM),freebsd)
|
|
|
|
+ # system integration
|
|
+ ifndef DEFAULT_LIBDIR
|
|
+ DEFAULT_LIBDIR = /usr/local/lib/openarena
|
|
+ endif
|
|
+
|
|
# flags
|
|
BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
|
|
-Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
|
+ -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \
|
|
-DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
|
|
CLIENT_CFLAGS = $(SDL_CFLAGS)
|
|
SERVER_CFLAGS =
|
|
@@ -595,27 +603,24 @@ ifeq ($(PLATFORM),freebsd)
|
|
|
|
# optional features/libraries
|
|
ifeq ($(USE_OPENAL),1)
|
|
- CLIENT_CFLAGS += -DUSE_OPENAL
|
|
+ CLIENT_CFLAGS += -DUSE_OPENAL $(OPENAL_CFLAGS)
|
|
+ CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
|
|
ifeq ($(USE_OPENAL_DLOPEN),1)
|
|
CLIENT_CFLAGS += -DUSE_OPENAL_DLOPEN
|
|
- CLIENT_LIBS += $(THREAD_LIBS) -lopenal
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(USE_CURL),1)
|
|
- CLIENT_CFLAGS += -DUSE_CURL
|
|
+ CLIENT_CFLAGS += -DUSE_CURL $(CURL_CFLAGS)
|
|
+ CLIENT_LIBS += $(CURL_LIBS)
|
|
ifeq ($(USE_CURL_DLOPEN),1)
|
|
CLIENT_CFLAGS += -DUSE_CURL_DLOPEN
|
|
- CLIENT_LIBS += -lcurl
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(USE_CODEC_VORBIS),1)
|
|
- CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
|
|
- endif
|
|
-
|
|
- ifeq ($(USE_CODEC_VORBIS),1)
|
|
- CLIENT_LIBS += -lvorbisfile -lvorbis -logg
|
|
+ CLIENT_CFLAGS += -DUSE_CODEC_VORBIS $(VORBIS_CFLAGS)
|
|
+ CLIENT_LIBS += $(VORBIS_LIBS)
|
|
endif
|
|
|
|
# cross-compiling tweaks
|
|
@@ -897,7 +902,7 @@ ifeq ($(USE_VOIP),1)
|
|
CLIENT_CFLAGS += -DUSE_VOIP
|
|
SERVER_CFLAGS += -DUSE_VOIP
|
|
ifeq ($(USE_INTERNAL_SPEEX),1)
|
|
- CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
|
|
+ CLIENT_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(CLIENT_CFLAGS)
|
|
else
|
|
CLIENT_LIBS += -lspeex -lspeexdsp
|
|
endif
|