From 1e6a12b9231a78ce827824c2f1bed53e31ee8677 Mon Sep 17 00:00:00 2001
From: Spike <Shpoike@users.noreply.github.com>
Date: Thu, 31 May 2018 17:02:35 +0100
Subject: [PATCH] Some compile fixes.

---
 Quake/Makefile        |  5 ++++-
 Quake/snd_voip.c      |  2 +-
 Quakespasm-Spiked.txt | 13 +++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 Quakespasm-Spiked.txt

diff --git a/Quake/Makefile b/Quake/Makefile
index 65d27df5..ff27936c 100644
--- a/Quake/Makefile
+++ b/Quake/Makefile
@@ -18,7 +18,7 @@ USE_CODEC_WAVE=1
 USE_CODEC_FLAC=0
 USE_CODEC_MP3=1
 USE_CODEC_VORBIS=1
-USE_CODEC_OPUS=0
+USE_CODEC_OPUS=1
 # either mikmod or xmp
 USE_CODEC_MIKMOD=0
 USE_CODEC_XMP=0
@@ -74,6 +74,8 @@ define do_strip
 endef
 endif
 
+CFLAGS += $(QSS_CFLAGS)
+LDFLAGS += $(QSS_LDFLAGS)
 ifeq ($(DO_USERDIRS),1)
 CFLAGS += -DDO_USERDIRS=1
 endif
@@ -158,6 +160,7 @@ ifeq ($(USE_CODEC_OPUS),1)
 CFLAGS+= -DUSE_CODEC_OPUS
 CFLAGS+= $(shell pkg-config --cflags opusfile)
 CODECLIBS+= $(shell pkg-config --libs   opusfile)
+CODECLIBS+= $(shell pkg-config --libs   opus)
 endif
 ifeq ($(USE_CODEC_VORBIS),1)
 CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec)
diff --git a/Quake/snd_voip.c b/Quake/snd_voip.c
index 2b18bc9e..623aede4 100644
--- a/Quake/snd_voip.c
+++ b/Quake/snd_voip.c
@@ -1320,7 +1320,7 @@ static struct
 #define OPUS_SET_BITRATE_REQUEST			4002
 #define OPUS_RESET_STATE					4028
 #ifdef OPUS_STATIC
-#include <opus/opus.h>
+#include <opus.h>
 #define qopus_encoder_create	opus_encoder_create
 #define qopus_encoder_destroy	opus_encoder_destroy
 #define qopus_encoder_ctl		opus_encoder_ctl
diff --git a/Quakespasm-Spiked.txt b/Quakespasm-Spiked.txt
old mode 100755
new mode 100644
index 6569b8cf..b2044cc0
--- a/Quakespasm-Spiked.txt
+++ b/Quakespasm-Spiked.txt
@@ -208,6 +208,19 @@ QuakeSpasm-Spiked
 
   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