diff --git a/Makefile b/Makefile
index b08e8d5..bb11160 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,19 @@ ARCH=$(shell uname -m | sed -e s/i.86/i386/)
 PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
 
 # cross compiling
+ifneq ($(PLATFORM), mingw32)
 ifeq ($(TARGET), win32)
 ARCH=x86
 PLATFORM=mingw32
 endif
 ifeq ($(TARGET), win64)
-ARCH=x86
+ARCH=x64
 PLATFORM=mingw32
 endif
+else 
+#we are compiling on windows
+ARCH=x86
+endif
 
 # set extension
 ifeq ($(PLATFORM), mingw32)
diff --git a/cgame/Makefile b/cgame/Makefile
index 7382291..520fbf0 100644
--- a/cgame/Makefile
+++ b/cgame/Makefile
@@ -9,6 +9,7 @@ PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
 CC = gcc
 
 # cross compiling
+ifneq ($(PLATFORM), mingw32)
 ifeq ($(TARGET), win32)
   PLATFORM=mingw32
   ARCH=x86
@@ -21,6 +22,10 @@ ifeq ($(TARGET), win64)
   CC=x86_64-w64-mingw32-gcc
   CFLAGS+=-m64
 endif
+else
+# we are compiling on windows
+ARCH=x86
+endif
 
 # cflags for the compiler
 ifeq ($(PLATFORM), mingw32)
@@ -32,7 +37,6 @@ endif
 # set extension
 ifeq ($(PLATFORM), mingw32)
 EXT=dll
-ARCH=x86
 else
 EXT=so
 endif
diff --git a/game/Makefile b/game/Makefile
index 1a3b69e..93df927 100644
--- a/game/Makefile
+++ b/game/Makefile
@@ -9,6 +9,7 @@ PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
 CC = gcc
 
 # cross compiling
+ifneq ($(PLATFORM), mingw32)
 ifeq ($(TARGET), win32)
   PLATFORM=mingw32
   ARCH=x86
@@ -21,6 +22,10 @@ ifeq ($(TARGET), win64)
   CC=x86_64-w64-mingw32-gcc
   CFLAGS+=-m64
 endif
+else
+#we are compiling on windows
+ARCH=x86
+endif
 
 # cflags for the compiler
 ifeq ($(PLATFORM), mingw32)
diff --git a/ui/Makefile b/ui/Makefile
index 8d191d6..d705b14 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -9,6 +9,7 @@ PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
 CC = gcc
 
 # cross compiling
+ifneq ($(TARGET), mingw32)
 ifeq ($(TARGET), win32)
   PLATFORM=mingw32
   ARCH=x86
@@ -17,10 +18,14 @@ ifeq ($(TARGET), win32)
 endif
 ifeq ($(TARGET), win64)
   PLATFORM=mingw32
-  ARCH=x86_64
+  ARCH=x64
   CC=x86_64-w64-mingw32-gcc
   CFLAGS+=-m64
 endif
+else
+# we are compiling on windows
+ARCH=x86
+endif
 
 # cflags for the compiler
 ifeq ($(PLATFORM), mingw32)
@@ -32,7 +37,6 @@ endif
 # set extension
 ifeq ($(PLATFORM), mingw32)
 EXT=dll
-ARCH=x86
 else
 EXT=so
 endif