Просмотр исходного кода

Revert "Revert "Missed some things in prev commit.""

This reverts commit 2e59788aa9be6dab49e06588fcb1cf812e55a0cf.
V.VamsiKrishna 10 лет назад
Родитель
Сommit
beab10ab9b
3 измененных файлов с 7 добавлено и 1 удалено
  1. 2 0
      SConstruct
  2. 2 1
      drivers/etc1/SCsub
  3. 3 0
      drivers/register_driver_types.cpp

+ 2 - 0
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')
 

+ 2 - 1
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)
 

+ 3 - 0
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();
 }