diff options
| author | Juan Linietsky | 2015-11-24 10:42:05 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-11-24 10:42:05 -0300 |
| commit | ccd40f76e8975b679619eb3591eb56376e82a6b3 (patch) | |
| tree | 9b6e4027c1c6bfdae82c2df54f1d9eb09d75ea43 /drivers | |
| parent | 85eedffbc77d9bdd92c8851aea09146feaf2d843 (diff) | |
| download | godot-ccd40f76e8975b679619eb3591eb56376e82a6b3.tar.gz godot-ccd40f76e8975b679619eb3591eb56376e82a6b3.tar.zst godot-ccd40f76e8975b679619eb3591eb56376e82a6b3.zip | |
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/SCsub | 6 | ||||
| -rw-r--r-- | drivers/register_driver_types.cpp | 4 | ||||
| -rw-r--r-- | drivers/theora/SCsub | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/drivers/SCsub b/drivers/SCsub index b94309013..8e241830f 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -31,7 +31,7 @@ SConscript("rtaudio/SCsub"); SConscript("nedmalloc/SCsub"); SConscript("nrex/SCsub"); SConscript("chibi/SCsub"); -if (env["vorbis"]=="yes" or env["speex"]=="yes" or env["theora"]=="yes" or env["opus"]=="yes"): +if (env["vorbis"]=="yes" or env["speex"]=="yes" or env["theoralib"]=="yes" or env["opus"]=="yes"): SConscript("ogg/SCsub"); if (env["vorbis"]=="yes"): SConscript("vorbis/SCsub"); @@ -40,9 +40,7 @@ if (env["opus"]=="yes"): if (env["tools"]=="yes"): SConscript("convex_decomp/SCsub"); -#if env["theora"]=="yes": -# SConscript("theoraplayer/SCsub") -if (env["theora"]=="yes"): +if (env["theoralib"]=="yes"): SConscript("theora/SCsub"); if (env['speex']=='yes'): SConscript("speex/SCsub"); diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp index c4ab54d10..ea19481c2 100644 --- a/drivers/register_driver_types.cpp +++ b/drivers/register_driver_types.cpp @@ -54,10 +54,6 @@ #include "theora/video_stream_theora.h" #endif -#ifdef THEORAPLAYER_ENABLED -#include "theoraplayer/video_stream_theoraplayer.h" -#endif - #include "drivers/nrex/regex.h" diff --git a/drivers/theora/SCsub b/drivers/theora/SCsub index faa1ede6a..b6b4af256 100644 --- a/drivers/theora/SCsub +++ b/drivers/theora/SCsub @@ -31,5 +31,4 @@ sources = [ "theora/video_stream_theora.cpp", ] -if env['use_theoraplayer_binary'] != "yes": - env.drivers_sources += sources +env.drivers_sources += sources |