diff --git a/spine-godot/build/build.bat b/spine-godot/build/build.bat
deleted file mode 100644
index 7b018de5a..000000000
--- a/spine-godot/build/build.bat
+++ /dev/null
@@ -1 +0,0 @@
-cd godot & scons target=debug custom_modules=..\spine_godot vsproj=yes livepp=%LIVEPP% --jobs=16 & cd ..
diff --git a/spine-godot/build/build.sh b/spine-godot/build/build.sh
index 1a285c630..f82f64ddb 100755
--- a/spine-godot/build/build.sh
+++ b/spine-godot/build/build.sh
@@ -46,6 +46,9 @@ if [ `uname` == 'Darwin' ] && [ $dev = "false" ]; then
 	chmod +x Godot.app/Contents/MacOS/Godot	
 	popd
 else
+	if [ "$OSTYPE" = "msys" ]; then
+		target="$target vsproj=yes livepp=$LIVEPP"
+	fi
 	scons $target compiledb=yes custom_modules="../spine_godot" -j16
 fi
 popd
diff --git a/spine-godot/build/setup.bat b/spine-godot/build/setup.bat
deleted file mode 100644
index 596f68488..000000000
--- a/spine-godot/build/setup.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-if [%1]==[] goto usage
-
-set branch=%1
-rmdir godot /s /q
-git clone --depth 1 https://github.com/godotengine/godot.git -b %branch%  || goto error
-xcopy /E /I .idea godot\.idea  || goto error
-copy custom.py godot  || goto error
-rmdir spine_godot\spine-cpp /s /q
-xcopy /E /I ..\spine-cpp\spine-cpp spine_godot\spine-cpp  || goto error
-cd godot & git apply ../livepp.patch & git apply ../livepp-v4.patch & cd ..
-build.bat || goto error
-exit 0
-
-:usage
-@echo.
-@echo Usage^: setup.bat ^<godot_branch_or_tag^>
-@echo.    
-@echo e.g.:
-@echo        setup.bat 3.4.4-stable
-@echo        setup.bat master
-exit 1
-
-:error
-@echo Couldn^'t setup Godot
\ No newline at end of file