diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-03 21:10:34 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-03 21:18:23 +0100 |
| commit | 611a94e3a673a61b51746366366c698c66ef0195 (patch) | |
| tree | 977cd1305cc8b5a1031d5607ed907355d08cc308 | |
| parent | f0b71621776af65911e624420bb79d118b438bbb (diff) | |
opus: Move public headers to match system install
| -rw-r--r-- | modules/opus/SCsub | 1 | ||||
| -rw-r--r-- | modules/opus/audio_stream_opus.h | 2 | ||||
| -rw-r--r-- | modules/webm/SCsub | 2 | ||||
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/opus/opus/opus.h (renamed from thirdparty/opus/opus.h) | 0 | ||||
| -rw-r--r-- | thirdparty/opus/opus/opus_custom.h (renamed from thirdparty/opus/opus_custom.h) | 0 | ||||
| -rw-r--r-- | thirdparty/opus/opus/opus_defines.h (renamed from thirdparty/opus/opus_defines.h) | 0 | ||||
| -rw-r--r-- | thirdparty/opus/opus/opus_multistream.h (renamed from thirdparty/opus/opus_multistream.h) | 0 | ||||
| -rw-r--r-- | thirdparty/opus/opus/opus_types.h (renamed from thirdparty/opus/opus_types.h) | 0 | ||||
| -rw-r--r-- | thirdparty/opus/opus/opusfile.h (renamed from thirdparty/opus/opusfile.h) | 0 |
10 files changed, 4 insertions, 3 deletions
diff --git a/modules/opus/SCsub b/modules/opus/SCsub index 491380c826..4d3053c7ec 100644 --- 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", diff --git a/modules/opus/audio_stream_opus.h b/modules/opus/audio_stream_opus.h index 4da66fe167..abf0b5c150 100644 --- 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 { diff --git a/modules/webm/SCsub b/modules/webm/SCsub index e417fc0cbf..889f5e83aa 100644 --- a/modules/webm/SCsub +++ b/modules/webm/SCsub @@ -24,7 +24,7 @@ if (env['builtin_libogg'] != 'no'): if (env['builtin_libvorbis'] != 'no'): env_webm.Append(CPPPATH=["#thirdparty/libvorbis"]) if (env['builtin_opus'] != 'no'): - env_webm.Append(CPPPATH=["#thirdparty"]) + env_webm.Append(CPPPATH=["#thirdparty/opus"]) if (env['builtin_libvpx'] != 'no'): Export('env_webm') diff --git a/thirdparty/README.md b/thirdparty/README.md index f61812c71a..a1445a7a9a 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -158,7 +158,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 diff --git a/thirdparty/opus/opus.h b/thirdparty/opus/opus/opus.h index b0bdf6f2df..b0bdf6f2df 100644 --- a/thirdparty/opus/opus.h +++ b/thirdparty/opus/opus/opus.h diff --git a/thirdparty/opus/opus_custom.h b/thirdparty/opus/opus/opus_custom.h index 41f36bf2fb..41f36bf2fb 100644 --- a/thirdparty/opus/opus_custom.h +++ b/thirdparty/opus/opus/opus_custom.h diff --git a/thirdparty/opus/opus_defines.h b/thirdparty/opus/opus/opus_defines.h index 647ed5d6f2..647ed5d6f2 100644 --- a/thirdparty/opus/opus_defines.h +++ b/thirdparty/opus/opus/opus_defines.h diff --git a/thirdparty/opus/opus_multistream.h b/thirdparty/opus/opus/opus_multistream.h index 47e03900bd..47e03900bd 100644 --- a/thirdparty/opus/opus_multistream.h +++ b/thirdparty/opus/opus/opus_multistream.h diff --git a/thirdparty/opus/opus_types.h b/thirdparty/opus/opus/opus_types.h index b28e03aea2..b28e03aea2 100644 --- a/thirdparty/opus/opus_types.h +++ b/thirdparty/opus/opus/opus_types.h diff --git a/thirdparty/opus/opusfile.h b/thirdparty/opus/opus/opusfile.h index 3604115c31..3604115c31 100644 --- a/thirdparty/opus/opusfile.h +++ b/thirdparty/opus/opus/opusfile.h |