Better handling for HXCPP_COLOR.

HaxeFoundation · Sep 2, 2024 · 95c69a2 · 95c69a2
1 parent 43c0cdc
commit 95c69a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tools/hxcpp/BuildTool.hx b/tools/hxcpp/BuildTool.hx
@@ -1539,8 +1539,11 @@ class BuildTool
       }
 
 
-      if (defines.exists("HXCPP_NO_COLOUR") || defines.exists("HXCPP_NO_COLOR"))
+      if (Sys.getEnv("HXCPP_COLOUR") != null || Sys.getEnv("HXCPP_COLOR") != null)
+         Log.colorSupported = !(defines.exists("HXCPP_NO_COLOUR") || defines.exists("HXCPP_NO_COLOR"));
+      else if (defines.exists("HXCPP_NO_COLOUR") || defines.exists("HXCPP_NO_COLOR"))
          Log.colorSupported = false;
+
       Log.verbose = defines.exists("HXCPP_VERBOSE");
       exitOnThreadError = defines.exists("HXCPP_EXIT_ON_ERROR");
 

diff --git a/tools/hxcpp/Log.hx b/tools/hxcpp/Log.hx
@@ -136,9 +136,6 @@ class Log
          }
          else
          {
-            if (Sys.getEnv('HXCPP_COLOR') != null)
-                  colorSupported = true;
-
             if (colorSupported != true && term != null)
             {
                colorSupported = ~/(?i)-256(color)?$/.match(term)