ref: 70360cb11e609cb4e4dadc6078813460d89086cb
parent: 078681a0973607c6527d0c232ee9e26a8e1885e5
author: Martin Storsjö <[email protected]>
date: Fri Feb 28 05:21:48 EST 2014
Move the ASM variable declaration into the x86-common file
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -20,7 +20,6 @@
GCCPREFIX = i686-linux-android
APP_ABI = x86
ifeq (Yes, $(USE_ASM))
- ASM = nasm
ASM_ARCH = x86
CFLAGS += -DX86_ASM
ASMFLAGS += -DNOPREFIX -f elf32 -DX86_32
--- a/build/platform-darwin.mk
+++ b/build/platform-darwin.mk
@@ -1,5 +1,4 @@
include build/platform-arch.mk
-ASM = nasm
SHAREDLIBSUFFIX = dylib
SHARED = -dynamiclib
CFLAGS += -Werror -fPIC -DMACOS -DMT_ENABLED -MMD -MP
--- a/build/platform-freebsd.mk
+++ b/build/platform-freebsd.mk
@@ -1,5 +1,4 @@
include build/platform-arch.mk
-ASM = nasm
SHAREDLIBSUFFIX = so
CFLAGS += -fPIC -DMT_ENABLED
LDFLAGS += -lpthread
--- a/build/platform-linux.mk
+++ b/build/platform-linux.mk
@@ -1,5 +1,4 @@
include build/platform-arch.mk
-ASM = nasm
SHAREDLIBSUFFIX = so
CFLAGS += -Werror -fPIC -DLINUX -DMT_ENABLED -MMD -MP
LDFLAGS += -lpthread
--- a/build/platform-mingw_nt.mk
+++ b/build/platform-mingw_nt.mk
@@ -1,5 +1,4 @@
include build/platform-x86-common.mk
-ASM = nasm
SHAREDLIBSUFFIX = dll
CFLAGS += -DMT_ENABLED -MMD -MP
LDFLAGS +=
--- a/build/platform-msvc.mk
+++ b/build/platform-msvc.mk
@@ -1,6 +1,5 @@
include build/platform-x86-common.mk
include build/platform-msvc-common.mk
-ASM = nasm
CFLAGS += -DMT_ENABLED
LDFLAGS += user32.lib
ifeq ($(ENABLE64BIT), Yes)
--- a/build/platform-x86-common.mk
+++ b/build/platform-x86-common.mk
@@ -18,4 +18,5 @@
CFLAGS += -DX86_ASM
ASM_ARCH = x86
endif
+ASM = nasm
ASMFLAGS += $(ASMFLAGS_PLATFORM) -DNO_DYNAMIC_VP