diff options
| author | Rémi Verschelde | 2016-11-03 21:10:34 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-11-03 21:22:56 +0100 |
| commit | da4a870bc40ebf62a13a8a136f43858cce78f66c (patch) | |
| tree | 3e8eba872f73d37b431bd3986819e9857f438416 | |
| parent | ce54b6ea8b080085d66937750c8e729f862da3ea (diff) | |
| download | godot-da4a870bc40ebf62a13a8a136f43858cce78f66c.tar.gz godot-da4a870bc40ebf62a13a8a136f43858cce78f66c.tar.zst godot-da4a870bc40ebf62a13a8a136f43858cce78f66c.zip | |
opus: Move public headers to match system install
(cherry picked from commit 611a94e3a673a61b51746366366c698c66ef0195)
Diffstat (limited to '')
| -rw-r--r-- | modules/opus/SCsub | 1 | ||||
| -rw-r--r-- | modules/opus/audio_stream_opus.h | 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 |
9 files changed, 3 insertions, 2 deletions
diff --git a/modules/opus/SCsub b/modules/opus/SCsub index 491380c82..4d3053c7e 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 4da66fe16..abf0b5c15 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/thirdparty/README.md b/thirdparty/README.md index 86ed75545..995805b86 100644 --- 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 diff --git a/thirdparty/opus/opus.h b/thirdparty/opus/opus/opus.h index b0bdf6f2d..b0bdf6f2d 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 41f36bf2f..41f36bf2f 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 647ed5d6f..647ed5d6f 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 47e03900b..47e03900b 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 b28e03aea..b28e03aea 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 3604115c3..3604115c3 100644 --- a/thirdparty/opus/opusfile.h +++ b/thirdparty/opus/opus/opusfile.h |