opus: Move public headers to match system install
This commit is contained in:
parent
f0b7162177
commit
611a94e3a6
|
@ -201,6 +201,7 @@ if (env['builtin_opus'] != 'no'):
|
||||||
thirdparty_include_paths = [
|
thirdparty_include_paths = [
|
||||||
"",
|
"",
|
||||||
"celt",
|
"celt",
|
||||||
|
"opus",
|
||||||
"silk",
|
"silk",
|
||||||
"silk/fixed",
|
"silk/fixed",
|
||||||
"silk/float",
|
"silk/float",
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include "os/file_access.h"
|
#include "os/file_access.h"
|
||||||
#include "scene/resources/audio_stream.h"
|
#include "scene/resources/audio_stream.h"
|
||||||
|
|
||||||
#include <opusfile.h>
|
#include <opus/opusfile.h>
|
||||||
|
|
||||||
class AudioStreamPlaybackOpus : public AudioStreamPlayback {
|
class AudioStreamPlaybackOpus : public AudioStreamPlayback {
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ if (env['builtin_libogg'] != 'no'):
|
||||||
if (env['builtin_libvorbis'] != 'no'):
|
if (env['builtin_libvorbis'] != 'no'):
|
||||||
env_webm.Append(CPPPATH=["#thirdparty/libvorbis"])
|
env_webm.Append(CPPPATH=["#thirdparty/libvorbis"])
|
||||||
if (env['builtin_opus'] != 'no'):
|
if (env['builtin_opus'] != 'no'):
|
||||||
env_webm.Append(CPPPATH=["#thirdparty"])
|
env_webm.Append(CPPPATH=["#thirdparty/opus"])
|
||||||
|
|
||||||
if (env['builtin_libvpx'] != 'no'):
|
if (env['builtin_libvpx'] != 'no'):
|
||||||
Export('env_webm')
|
Export('env_webm')
|
||||||
|
|
2
thirdparty/README.md
vendored
2
thirdparty/README.md
vendored
|
@ -158,7 +158,7 @@ Files extracted from upstream source:
|
||||||
|
|
||||||
- all .c and .h files in src/ (both opus and opusfile),
|
- all .c and .h files in src/ (both opus and opusfile),
|
||||||
except `opus_demo.c`
|
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
|
- COPYING
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue