diff --git a/extra/make_and_run b/extra/make_and_run
index 73924e4..2c0b67e 100755
--- a/extra/make_and_run
+++ b/extra/make_and_run
@@ -3,7 +3,11 @@
 printf "\n============================================[ Building Application ]============================================\n\n"
 rm -r ./res
 \cp -r ../extra/* ./
-make
+if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+    make
+elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then
+    mingw32-make.exe
+fi
 if [ $? -eq 0 ]; then
     printf "\n============================================[ Running Application ]============================================\n\n"
     ./framework-test