fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some compile fixes.

This commit is contained in:
Spike 2018-05-31 17:02:35 +01:00 committed by Shpoike
parent f6d31e9db9
commit 1e6a12b923
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Quake/Makefile
View File

@ -18,7 +18,7 @@ USE_CODEC_WAVE=1
USE_CODEC_FLAC=0 USE_CODEC_FLAC=0
USE_CODEC_MP3=1 USE_CODEC_MP3=1
USE_CODEC_VORBIS=1 USE_CODEC_VORBIS=1
USE_CODEC_OPUS=0 USE_CODEC_OPUS=1
# either mikmod or xmp # either mikmod or xmp
USE_CODEC_MIKMOD=0 USE_CODEC_MIKMOD=0
USE_CODEC_XMP=0 USE_CODEC_XMP=0
@ -74,6 +74,8 @@ define do_strip
endef endef
endif endif
CFLAGS += $(QSS_CFLAGS)
LDFLAGS += $(QSS_LDFLAGS)
ifeq ($(DO_USERDIRS),1) ifeq ($(DO_USERDIRS),1)
CFLAGS += -DDO_USERDIRS=1 CFLAGS += -DDO_USERDIRS=1
endif endif
@ -158,6 +160,7 @@ ifeq ($(USE_CODEC_OPUS),1)
CFLAGS+= -DUSE_CODEC_OPUS CFLAGS+= -DUSE_CODEC_OPUS
CFLAGS+= $(shell pkg-config --cflags opusfile) CFLAGS+= $(shell pkg-config --cflags opusfile)
CODECLIBS+= $(shell pkg-config --libs opusfile) CODECLIBS+= $(shell pkg-config --libs opusfile)
CODECLIBS+= $(shell pkg-config --libs opus)
endif endif
ifeq ($(USE_CODEC_VORBIS),1) ifeq ($(USE_CODEC_VORBIS),1)
CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec) CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec)

2
Quake/snd_voip.c
View File

@ -1320,7 +1320,7 @@ static struct
#define OPUS_SET_BITRATE_REQUEST 4002 #define OPUS_SET_BITRATE_REQUEST 4002
#define OPUS_RESET_STATE 4028 #define OPUS_RESET_STATE 4028
#ifdef OPUS_STATIC #ifdef OPUS_STATIC
#include <opus/opus.h> #include <opus.h>
#define qopus_encoder_create opus_encoder_create #define qopus_encoder_create opus_encoder_create
#define qopus_encoder_destroy opus_encoder_destroy #define qopus_encoder_destroy opus_encoder_destroy
#define qopus_encoder_ctl opus_encoder_ctl #define qopus_encoder_ctl opus_encoder_ctl

13
Quakespasm-Spiked.txt Executable file → Normal file
View File

@ -208,6 +208,19 @@ QuakeSpasm-Spiked
o Additional code and binaries are released under the same license. o Additional code and binaries are released under the same license.
o The public linux build statically links against various common libraries
in order to reduce version conflicts (compiled on a Debian 8/Jessie system).
For system integration, it still requires the SDL 1.2 package from your distro.
. libjpeg 9b
. libz 1.2.11
. libpng 1.6.34
. lobogg 1.3.3
. libvorbis[file] 1.3.5
. libopus 1.3-beta
. libopusfile 0.9
. libmad 0.15.1b
------------------- -------------------
6. Links / Contact 6. Links / Contact