From beab10ab9b18c8081ad85d2a59ce23e943f835b0 Mon Sep 17 00:00:00 2001
From: "V.VamsiKrishna" <vk@bsb.in>
Date: Fri, 20 Mar 2015 11:48:21 +0530
Subject: [PATCH] Revert "Revert "Missed some things in prev commit.""

This reverts commit 2e59788aa9be6dab49e06588fcb1cf812e55a0cf.
---
 SConstruct                        | 2 ++
 drivers/etc1/SCsub                | 3 ++-
 drivers/register_driver_types.cpp | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index 50acd3884d6..42c803e81e0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -308,6 +308,8 @@ if selected_platform in platform_list:
 	if (env['colored']=='yes'):
 		methods.colored(sys,env)
 		
+	if (env['etc1']=='yes'):
+		env.Append(CPPFLAGS=['-DETC1_ENABLED'])
 
 	Export('env')
 
diff --git a/drivers/etc1/SCsub b/drivers/etc1/SCsub
index 152dc3f4d04..251c3ffb868 100644
--- a/drivers/etc1/SCsub
+++ b/drivers/etc1/SCsub
@@ -6,7 +6,8 @@ etc_sources = [
 	"etc1/rg_etc1.cpp"
 ]
 
-env.drivers_sources+=etc_sources
+if (env["etc1"] != "no"):
+    env.drivers_sources+=etc_sources
 
 #env.add_source_files(env.drivers_sources, etc_sources)
 
diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp
index e4bb1a343a7..e730171fbba 100644
--- a/drivers/register_driver_types.cpp
+++ b/drivers/register_driver_types.cpp
@@ -222,7 +222,10 @@ void register_driver_types() {
 #endif
 #endif
 
+#ifdef ETC1_ENABLED
 	_register_etc1_compress_func();
+#endif
+
 	initialize_chibi();
 }