okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add libogg 1.3.0

Browse source
This commit is contained in:
Zack Middleton 2013-02-17 18:56:06 -06:00
parent 6d56d8bb33
commit 2a31f33fc6
5 changed files with 3335 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Makefile
View file

@ -185,6 +185,10 @@ ifndef USE_INTERNAL_SPEEX
USE_INTERNAL_SPEEX=1
endif
ifndef USE_INTERNAL_OGG
USE_INTERNAL_OGG=1
endif
ifndef USE_INTERNAL_OPUS
USE_INTERNAL_OPUS=1
endif
@ -234,6 +238,7 @@ UIDIR=$(MOUNT_DIR)/ui
Q3UIDIR=$(MOUNT_DIR)/q3_ui
JPDIR=$(MOUNT_DIR)/jpeg-8c
SPEEXDIR=$(MOUNT_DIR)/libspeex
OGGDIR=$(MOUNT_DIR)/libogg-1.3.0
OPUSDIR=$(MOUNT_DIR)/opus-1.0.2
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.2
ZDIR=$(MOUNT_DIR)/zlib
@ -374,10 +379,6 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
endif
ifeq ($(USE_MUMBLE),1)
CLIENT_LIBS += -lrt
endif
@ -444,10 +445,6 @@ ifeq ($(PLATFORM),darwin)
BASE_CFLAGS += $(FREETYPE_CFLAGS)
endif
ifeq ($(USE_CODEC_VORBIS),1)
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
endif
BASE_CFLAGS += -D_THREAD_SAFE=1
ifeq ($(USE_LOCAL_HEADERS),1)
@ -553,10 +550,6 @@ ifeq ($(PLATFORM),mingw32)
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
endif
ifeq ($(ARCH),x86)
# build 32bit
BASE_CFLAGS += -m32
@ -634,10 +627,6 @@ ifeq ($(PLATFORM),freebsd)
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
endif
# cross-compiling tweaks
ifeq ($(ARCH),i386)
ifeq ($(CROSS_COMPILING),1)
@ -690,10 +679,6 @@ ifeq ($(PLATFORM),openbsd)
endif
endif
ifeq ($(USE_CODEC_VORBIS),1)
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
endif
ifeq ($(USE_CURL),1)
ifneq ($(USE_CURL_DLOPEN),1)
CLIENT_LIBS += -lcurl
@ -922,6 +907,8 @@ endif
ifeq ($(USE_CODEC_VORBIS),1)
CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
CLIENT_LIBS += -lvorbisfile -lvorbis
NEED_OGG=1
endif
ifeq ($(USE_CODEC_OPUS),1)
@ -933,7 +920,16 @@ ifeq ($(USE_CODEC_OPUS),1)
CLIENT_CFLAGS += -I$(OPUSFILEDIR)/include
else
CLIENT_LIBS += -lopusfile -lopus -logg
CLIENT_LIBS += -lopusfile -lopus
endif
NEED_OGG=1
endif
ifeq ($(NEED_OGG),1)
ifeq ($(USE_INTERNAL_OGG),1)
CLIENT_CFLAGS += -I$(OGGDIR)/include
else
CLIENT_LIBS += -logg
endif
endif
@ -1885,6 +1881,14 @@ Q3OBJ += \
endif
endif
ifeq ($(NEED_OGG),1)
ifeq ($(USE_INTERNAL_OGG),1)
Q3OBJ += \
$(B)/client/bitwise.o \
$(B)/client/framing.o
endif
endif
ifeq ($(USE_INTERNAL_ZLIB),1)
Q3OBJ += \
$(B)/client/adler32.o \
@ -2499,6 +2503,9 @@ $(B)/client/%.o: $(BLIBDIR)/%.c
$(B)/client/%.o: $(SPEEXDIR)/%.c
$(DO_CC)
$(B)/client/%.o: $(OGGDIR)/src/%.c
$(DO_CC)
$(B)/client/opus/%.o: $(OPUSDIR)/src/%.c
$(DO_CC)