diff --git a/Makefile b/Makefile
index c24ecf32..6c5ef9ae 100644
--- a/Makefile
+++ b/Makefile
@@ -904,13 +904,15 @@ endif
 #icon
 ifeq ($(WINDOWS_BUILD),1)
 	ifeq ($(ICON),1)
-		Command := mkdir $(BUILD_DIR)/res
-		Resp := $(shell $(call Command))
+		Command := mkdir -p "$(BUILD_DIR)/res"
+    		Resp := $(shell $(call Command))
 
-		Command := windres -o "$(BUILD_DIR)/res/icon.o" -i res/icon.rc
-		Resp := $(shell $(call Command))
+		Command := windres -o "$(BUILD_DIR)/res/icon.o" -i "res/icon.rc"
+    		Resp := $(shell $(call Command))
 
-		LDFLAGS += $(BUILD_DIR)/res/icon.o
+    		ifeq ($(.SHELLSTATUS),0)
+     			LDFLAGS += $(BUILD_DIR)/res/icon.o
+		endif
 	endif
 endif