瀏覽代碼

Revert "Revert "Removing etc1 from build for javascript platform.""

This reverts commit 9965e93f7eb7297490de597cc8ed8e18b4ba2872.
V.VamsiKrishna 10 年之前
父節點
當前提交
eb3c88b3dd
共有 3 個文件被更改,包括 2 次插入4 次删除
  1. 1 0
      SConstruct
  2. 0 4
      drivers/etc1/rg_etc1.cpp
  3. 1 0
      platform/javascript/detect.py

+ 1 - 0
SConstruct

@@ -111,6 +111,7 @@ 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')

+ 0 - 4
drivers/etc1/rg_etc1.cpp

@@ -1918,11 +1918,7 @@ 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;

+ 1 - 0
platform/javascript/detect.py

@@ -36,6 +36,7 @@ def get_flags():
 		('squish', 'no'),
 		('speex', 'no'),
 		('old_scenes', 'no'),
+		('etc1', 'no'),
 #		('default_gui_theme', 'no'),
 
 		#('builtin_zlib', 'no'),