diff --git a/build/platform-msvc-arm.mk b/build/platform-msvc-arm.mk
deleted file mode 100644
index 4b7324e0..00000000
--- a/build/platform-msvc-arm.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-include build/platform-msvc-common.mk
-CFLAGS_OPT += -MD
-CFLAGS_DEBUG += -MDd
-ARCH=arm
-include build/platform-arch.mk
-CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP -MD -DWIN32
-CXXFLAGS += -ZW
-LDFLAGS +=
-CCAS = gas-preprocessor.pl -as-type armasm -force-thumb -- armasm
-
diff --git a/build/platform-msvc-common.mk b/build/platform-msvc-common.mk
index d003923f..15c95d1c 100644
--- a/build/platform-msvc-common.mk
+++ b/build/platform-msvc-common.mk
@@ -1,3 +1,20 @@
+include build/platform-arch.mk
+ifeq ($(ASM_ARCH), x86)
+ifeq ($(ENABLE64BIT), Yes)
+ASMFLAGS += -f win64
+ASMFLAGS_PLATFORM = -DWIN64
+CFLAGS += -DWIN64
+else
+ASMFLAGS += -f win32 -DPREFIX
+CFLAGS += -DWIN32
+endif
+else
+CFLAGS += -DWIN32
+endif
+ifeq ($(ASM_ARCH), arm)
+CCAS = gas-preprocessor.pl -as-type armasm -force-thumb -- armasm
+endif
+
 CC=cl
 CXX=cl
 AR=lib
diff --git a/build/platform-msvc-wp.mk b/build/platform-msvc-wp.mk
new file mode 100644
index 00000000..2726c386
--- /dev/null
+++ b/build/platform-msvc-wp.mk
@@ -0,0 +1,8 @@
+ARCH = arm
+include build/platform-msvc-common.mk
+CFLAGS_OPT += -MD
+CFLAGS_DEBUG += -MDd
+CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
+CXXFLAGS += -ZW
+LDFLAGS +=
+
diff --git a/build/platform-msvc.mk b/build/platform-msvc.mk
index 7105693c..3a95d9b6 100644
--- a/build/platform-msvc.mk
+++ b/build/platform-msvc.mk
@@ -1,14 +1,5 @@
-include build/platform-x86-common.mk
 include build/platform-msvc-common.mk
 LDFLAGS += user32.lib
 CFLAGS_OPT += -MT
 CFLAGS_DEBUG += -MTd
-ifeq ($(ENABLE64BIT), Yes)
-ASMFLAGS += -f win64
-ASMFLAGS_PLATFORM = -DWIN64
-CFLAGS += -DWIN64
-else
-ASMFLAGS += -f win32 -DPREFIX
-CFLAGS += -DWIN32
-endif