diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-11-24 10:42:05 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-24 10:42:05 -0300 |
commit | ccd40f76e8975b679619eb3591eb56376e82a6b3 (patch) | |
tree | 9b6e4027c1c6bfdae82c2df54f1d9eb09d75ea43 /drivers/SCsub | |
parent | 85eedffbc77d9bdd92c8851aea09146feaf2d843 (diff) |
-work in progress resourceparser and .tscn parser. Still non-functional
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
Diffstat (limited to 'drivers/SCsub')
-rw-r--r-- | drivers/SCsub | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/SCsub b/drivers/SCsub index b94309013a..8e241830f8 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"); |