ref: 5a72a09f5a7d0432e18ff085f7591655ed882ad8
parent: bcf1af9ac102fabb2003be298b5de9672cc29492
parent: 3026958bdeac14c16f76fb354e441e6b702f55e3
author: ruil2 <ruil2@cisco.com>
date: Fri Apr 11 12:24:44 EDT 2014
Merge pull request #673 from mstorsjo/msvc-common-arch Move all arch handling in msvc platform files into msvc-common
--- a/build/platform-msvc-arm.mk
+++ /dev/null
@@ -1,10 +1,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
-
--- 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
--- /dev/null
+++ b/build/platform-msvc-wp.mk
@@ -1,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 +=
+
--- 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