Bladeren bron

Revert "Missed some things in prev commit."

This reverts commit d3280f91a13da6c106f95c289c095714c638d201.
V.VamsiKrishna 10 jaren geleden
bovenliggende
commit
2e59788aa9
3 gewijzigde bestanden met toevoegingen van 1 en 7 verwijderingen
  1. 0 2
      SConstruct
  2. 1 2
      drivers/etc1/SCsub
  3. 0 3
      drivers/register_driver_types.cpp

+ 0 - 2
SConstruct

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

+ 1 - 2
drivers/etc1/SCsub

@@ -6,8 +6,7 @@ etc_sources = [
 	"etc1/rg_etc1.cpp"
 ]
 
-if (env["etc1"] != "no"):
-    env.drivers_sources+=etc_sources
+env.drivers_sources+=etc_sources
 
 #env.add_source_files(env.drivers_sources, etc_sources)
 

+ 0 - 3
drivers/register_driver_types.cpp

@@ -222,10 +222,7 @@ void register_driver_types() {
 #endif
 #endif
 
-#ifdef ETC1_ENABLED
 	_register_etc1_compress_func();
-#endif
-
 	initialize_chibi();
 }