ref: 48f7470867adcba7957b316c7697042fc256c8a9
parent: 1ee52616ac92a43abddf1b80549884c65d24f185
author: Martin Storsjö <martin@martin.st>
date: Fri Apr 11 06:48:37 EDT 2014
Move all x86 vs arm handling to msvc-common
--- a/build/platform-msvc-arm.mk
+++ b/build/platform-msvc-arm.mk
@@ -1,10 +1,8 @@
+ARCH = arm
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 -DWIN32
+CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
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
--- 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