opus: Move public headers to match system install

(cherry picked from commit 611a94e3a6)
2016-11-03 21:10:34 +01:00 · 2016-11-03 21:10:34 +01:00 · da4a870bc4
commit da4a870bc4
parent ce54b6ea8b
9 changed files with 3 additions and 2 deletions
--- a/modules/opus/SCsub
+++ b/modules/opus/SCsub
@ -201,6 +201,7 @@ if (env['builtin_opus'] != 'no'):
    thirdparty_include_paths = [
        "",
        "celt",
+        "opus",
        "silk",
        "silk/fixed",
        "silk/float",
--- a/modules/opus/audio_stream_opus.h
+++ b/modules/opus/audio_stream_opus.h
@ -36,7 +36,7 @@
 #include "os/file_access.h"
 #include "scene/resources/audio_stream.h"

-#include <opusfile.h>
+#include <opus/opusfile.h>

 class AudioStreamPlaybackOpus : public AudioStreamPlayback {

--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@ -128,7 +128,7 @@ Files extracted from upstream source:

 - all .c and .h files in src/ (both opus and opusfile),
  except `opus_demo.c`
- all .h files in include/ (both opus and opusfile)
+- all .h files in include/ (both opus and opusfile) as opus/
 - COPYING


--- a/thirdparty/opus/opus/opus.h
+++ b/thirdparty/opus/opus/opus.h
--- a/thirdparty/opus/opus/opus_custom.h
+++ b/thirdparty/opus/opus/opus_custom.h
--- a/thirdparty/opus/opus/opus_defines.h
+++ b/thirdparty/opus/opus/opus_defines.h
--- a/thirdparty/opus/opus/opus_multistream.h
+++ b/thirdparty/opus/opus/opus_multistream.h
--- a/thirdparty/opus/opus/opus_types.h
+++ b/thirdparty/opus/opus/opus_types.h
--- a/thirdparty/opus/opus/opusfile.h
+++ b/thirdparty/opus/opus/opusfile.h