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 /SConstruct | |
| 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 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 05c53a15fc..15db0c48b0 100644 --- a/SConstruct +++ b/SConstruct @@ -106,7 +106,7 @@ opts.Add('opus','Build Opus Audio Format Support: (yes/no)','yes') opts.Add('minizip','Build Minizip Archive Support: (yes/no)','yes') opts.Add('squish','Squish BC Texture Compression in editor (yes/no)','yes') opts.Add('theora','Theora Video (yes/no)','yes') -opts.Add('use_theoraplayer_binary', "Use precompiled binaries from libtheoraplayer for ogg/theora/vorbis (yes/no)", "no") +opts.Add('theoralib','Theora Video (yes/no)','no') opts.Add('freetype','Freetype support in editor','yes') opts.Add('speex','Speex Audio (yes/no)','yes') opts.Add('xml','XML Save/Load support (yes/no)','yes') @@ -305,7 +305,10 @@ if selected_platform in platform_list: env.Append(CPPFLAGS=['-DOPUS_ENABLED']); if (env['theora']=='yes'): - env.Append(CPPFLAGS=['-DTHEORA_ENABLED']); + env['theoralib']='yes' + env.Append(CPPFLAGS=['-DTHEORA_ENABLED']); + if (env['theoralib']=='yes'): + env.Append(CPPFLAGS=['-DTHEORALIB_ENABLED']); if (env['png']=='yes'): env.Append(CPPFLAGS=['-DPNG_ENABLED']); |