[iortcw] 441/497: All: Fix building with external opus/opusfile

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 96d0edd5c16309877c78135a82df60e3be3bb9c5
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Tue Nov 24 10:04:03 2015 -0500

    All: Fix building with external opus/opusfile
---
 MP/code/client/client.h | 8 +++++++-
 SP/code/client/client.h | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/MP/code/client/client.h b/MP/code/client/client.h
index cdd2fe7..a0d6228 100644
--- a/MP/code/client/client.h
+++ b/MP/code/client/client.h
@@ -42,7 +42,13 @@ If you have questions concerning this license or the applicable additional terms
 #endif /* USE_CURL */
 
 #ifdef USE_VOIP
-#include <opus.h>
+#ifdef USE_LOCAL_HEADERS
+  #include "../opus-1.1/include/opus.h"
+  #include "../opusfile-0.6/include/opusfile.h"
+#else
+  #include <opus/opus.h>
+  #include <opus/opusfile.h>
+#endif
 #endif
 
 // file full of random crap that gets used to create cl_guid
diff --git a/SP/code/client/client.h b/SP/code/client/client.h
index ea0f9b4..1b65c8c 100644
--- a/SP/code/client/client.h
+++ b/SP/code/client/client.h
@@ -42,7 +42,13 @@ If you have questions concerning this license or the applicable additional terms
 #endif /* USE_CURL */
 
 #ifdef USE_VOIP
-#include <opus.h>
+#ifdef USE_LOCAL_HEADERS
+  #include "../opus-1.1/include/opus.h"
+  #include "../opusfile-0.6/include/opusfile.h"
+#else
+  #include <opus/opus.h>
+  #include <opus/opusfile.h>
+#endif
 #endif
 
 // file full of random crap that gets used to create cl_guid

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git