Browse Source

opus: Move public headers to match system install

(cherry picked from commit 611a94e3a673a61b51746366366c698c66ef0195)
Rémi Verschelde 8 years ago
parent
commit
da4a870bc4

+ 1 - 0
modules/opus/SCsub

@@ -201,6 +201,7 @@ if (env['builtin_opus'] != 'no'):
     thirdparty_include_paths = [
         "",
         "celt",
+        "opus",
         "silk",
         "silk/fixed",
         "silk/float",

+ 1 - 1
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 {
 

+ 1 - 1
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
 
 

+ 0 - 0
thirdparty/opus/opus.h → thirdparty/opus/opus/opus.h


+ 0 - 0
thirdparty/opus/opus_custom.h → thirdparty/opus/opus/opus_custom.h


+ 0 - 0
thirdparty/opus/opus_defines.h → thirdparty/opus/opus/opus_defines.h


+ 0 - 0
thirdparty/opus/opus_multistream.h → thirdparty/opus/opus/opus_multistream.h


+ 0 - 0
thirdparty/opus/opus_types.h → thirdparty/opus/opus/opus_types.h


+ 0 - 0
thirdparty/opus/opusfile.h → thirdparty/opus/opus/opusfile.h