Fixed OS/MODEL detection for Windows

test/Makefile

@@ -59,6 +59,24 @@
 #                        considered to be enabled).
 #                        default: (none, enabled)
 
+ifeq (Windows_NT,$(OS))
+    ifeq ($(findstring WOW64, $(shell uname)),WOW64)
+	OS:=win64
+	MODEL:=64
+    else
+	OS:=win32
+	MODEL:=32
+    endif
+endif
+ifeq (Win_32,$(OS))
+    OS:=win32
+    MODEL:=32
+endif
+ifeq (Win_64,$(OS))
+    OS:=win64
+    MODEL:=64
+endif
+
 include ../src/osmodel.mak
 
 export OS