diff --git a/Makefile b/Makefile
index b6fa035..731a39d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ ifeq ($(OS), Windows_NT)
 
 	# Set Windows commands
 	THEN = &&
-	cleanCommand = del ${CURDIR}\build\app.exe
+	cleanCommand = del ${CURDIR}\build\*.exe
 else
 	# Check for MacOS/Linux
 	UNAMEOS := $(shell uname)
@@ -58,9 +58,9 @@ include: submodules
 # Copy commands for Windows
 ifeq ($(platform), Windows)
 	-mkdir $(mkdirOptions) .\include
-	-robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h
-	-robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h
-	-robocopy "vendor\raylib-cpp\include" "include" *.hpp
+	robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 exit errorlevel
+	robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 exit errorlevel
+	robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 exit errorlevel
 # Copy commands for UNIX/Linux
 else
 	mkdir $(mkdirOptions) include
@@ -74,7 +74,7 @@ lib: submodules
 	cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP
 ifeq ($(platform), Windows)
 	-mkdir $(mkdirOptions) lib\$(platform)
-	-robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a
+	robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 exit errorlevel
 else
 	mkdir $(mkdirOptions) lib/$(platform)
 	cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a