diff --git a/tools/platforms/WindowsPlatform.hx b/tools/platforms/WindowsPlatform.hx
index 263082877..418bf1bf1 100644
--- a/tools/platforms/WindowsPlatform.hx
+++ b/tools/platforms/WindowsPlatform.hx
@@ -467,7 +467,7 @@ class WindowsPlatform extends PlatformTarget {
 
 			var commands = [];
 
-			if (!targetFlags.exists ("64") && (command == "rebuild" || System.hostArchitecture == X86)) {
+			if (!targetFlags.exists ("64") && (command == "rebuild" || System.hostArchitecture == X86 || targetType != "cpp")) {
 
 				if (targetFlags.exists ("winrt")) {
 
@@ -485,7 +485,7 @@ class WindowsPlatform extends PlatformTarget {
 			// as previous Windows builds. For now, force -64 to be done last
 			// so that it can be debugged in a default "rebuild"
 
-			if (!targetFlags.exists ("32") && System.hostArchitecture == X64) {
+			if (!targetFlags.exists ("32") && System.hostArchitecture == X64 && (command != "rebuild" || targetType == "cpp")) {
 
 				if (targetFlags.exists ("winrt")) {