5 files changed, 6 insertions, 13 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index acf4ce412..842036f98 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -131,7 +131,7 @@ def configure(env):
 		gcc_path=gcc_path+"/darwin-x86_64/bin"
 		env['SHLINKFLAGS'][1] = '-shared'
 		env['SHLIBSUFFIX'] = '.so'
-	elif (os.platform.startswith('win')):
+	elif (sys.platform.startswith('win')):
                 if (platform.machine().endswith('64')):
 			gcc_path=gcc_path+"/windows-x86_64/bin"
                 else:
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index f8b2153ae..4e772e37e 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -91,9 +91,6 @@ def configure(env):
 		env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
 		env["CC"]="clang"
 		env["LD"]="clang++"
-		if (env["colored"]=="yes"):
-			if sys.stdout.isatty():
-				env.Append(CPPFLAGS=["-fcolor-diagnostics"])
 
 	import methods
 
diff --git a/platform/server/detect.py b/platform/server/detect.py
index 2f6fb00e0..ce14100fd 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -38,9 +38,6 @@ def configure(env):
 		env["CC"]="clang"
 		env["CXX"]="clang++"
 		env["LD"]="clang++"
-		if (env["colored"]=="yes"):
-			if sys.stdout.isatty():
-				env.Append(CXXFLAGS=["-fcolor-diagnostics"])
 
 	is64=sys.maxsize > 2**32
 
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 38e738a41..286f5fb0b 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1366,13 +1366,16 @@ void OS_Windows::set_mouse_mode(MouseMode p_mode) {
 		POINT pos = { (int) center.x, (int) center.y };
 		ClientToScreen(hWnd, &pos);
 		SetCursorPos(pos.x, pos.y);
-		ShowCursor(false);
 	} else {
-		ShowCursor(true);
 		ReleaseCapture();
 		ClipCursor(NULL);
 	}
 
+	if (p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_HIDDEN) {
+		hCursor = SetCursor(NULL);
+	} else {
+		SetCursor(hCursor);
+	}
 }
 
 OS_Windows::MouseMode OS_Windows::get_mouse_mode() const{
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index eb71ac740..917a8a27d 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -94,10 +94,6 @@ def configure(env):
 		env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
 		env.extra_suffix=".llvm"
 
-		if (env["colored"]=="yes"):
-			if sys.stdout.isatty():
-				env.Append(CXXFLAGS=["-fcolor-diagnostics"])
-
 	if (env["use_sanitizer"]=="yes"):
 		env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
 		env.Append(LINKFLAGS=['-fsanitize=address'])