diff --git a/build_files/windows/set_build_dir.cmd b/build_files/windows/set_build_dir.cmd
index bb01749c5ee..65b5923cd9a 100644
--- a/build_files/windows/set_build_dir.cmd
+++ b/build_files/windows/set_build_dir.cmd
@@ -1,4 +1,9 @@
-set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
+if NOT "%TARGET%" == "" (
+    set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
+) else (
+    set BUILD_DIR=%BUILD_DIR%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
+)
+
 if NOT "%BUILD_DIR_OVERRRIDE%"=="" (
 	set BUILD_DIR=%BUILD_DIR_OVERRRIDE%
 )
\ No newline at end of file