diff options
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | drivers/etc1/rg_etc1.cpp | 4 | ||||
| -rw-r--r-- | platform/javascript/detect.py | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 42c803e81e..cb32c0b5ff 100644 --- a/SConstruct +++ b/SConstruct @@ -111,7 +111,6 @@ opts.Add('jpg','JPG Image loader support (yes/no)','yes') opts.Add('webp','WEBP Image loader support (yes/no)','yes') opts.Add('dds','DDS Texture loader support (yes/no)','yes') opts.Add('pvr','PVR (PowerVR) Texture loader support (yes/no)','yes') -opts.Add('etc1','etc1 Texture compression support (yes/no)','yes') opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes') opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no') opts.Add('musepack','Musepack Audio (yes/no)','yes') diff --git a/drivers/etc1/rg_etc1.cpp b/drivers/etc1/rg_etc1.cpp index d2959da386..7eb1427d7a 100644 --- a/drivers/etc1/rg_etc1.cpp +++ b/drivers/etc1/rg_etc1.cpp @@ -1918,7 +1918,11 @@ done: int v = etc1_decode_value(diff, inten, selector, packed_c);
uint err = labs(v - static_cast<int>(color));
//printf("err: %d - %u = %u\n",v,color,err);
+ #ifdef JAVASCRIPT_ENABLED
+ if (err < best_error || best_error == cUINT32_MAX)
+ #else
if (err < best_error)
+ #endif
{
best_error = err;
best_packed_c = packed_c;
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 947a637fb9..3123367ff0 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -36,7 +36,6 @@ def get_flags(): ('squish', 'no'), ('speex', 'no'), ('old_scenes', 'no'), - ('etc1', 'no'), # ('default_gui_theme', 'no'), #('builtin_zlib', 'no'), |