From 07750b6a1877d7178b20edc123fc2e093e3455d8 Mon Sep 17 00:00:00 2001
From: NicJA <NicJA@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sun, 16 Apr 2017 04:35:57 +0000
Subject: [PATCH] use USER_CFLAGS _not_ CFLAGS directly. also set the correct
 flags for arm/x86_64 builds.

git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@54535 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 MultiMedia/mad/mmakefile.src | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/MultiMedia/mad/mmakefile.src b/MultiMedia/mad/mmakefile.src
index 98f70157d..50085247d 100644
--- a/MultiMedia/mad/mmakefile.src
+++ b/MultiMedia/mad/mmakefile.src
@@ -1,4 +1,4 @@
-# Copyright © 2003, The AROS Development Team. All rights reserved.
+# Copyright © 2003-2017, The AROS Development Team. All rights reserved.
 # $Id$
 
 # Have a look at doc/PATENTS
@@ -20,13 +20,23 @@ FILES  := madoss \
 	  timer \
 	  version
 
-CFLAGS += -DHAVE_CONFIG_H -O2 $(NOWARN_CPP)
+NOWARN_FLAGS := $(NOWARN_CPP)
 
-ifeq ($(AROS_TARGET_CPU),i386)
-CFLAGS += -DFPM_INTEL
+ifeq (i386,$(AROS_TARGET_CPU))
+MADOSS_CPUFLAGS := -DFPM_INTEL
 else
-CFLAGS += -DFPM_DEFAULT
+ifeq (x86_64,$(AROS_TARGET_CPU))
+MADOSS_CPUFLAGS := -DFPM_INTEL -DFPM_64BIT
+else
+ifneq (,$(findstring $(AROS_TARGET_CPU),arm))
+MADOSS_CPUFLAGS := -DFPM_ARM
+else
+MADOSS_CPUFLAGS := -DFPM_DEFAULT
+endif
 endif
+endif
+
+USER_CFLAGS := -DHAVE_CONFIG_H $(MADOSS_CPUFLAGS) $(NOWARN_FLAGS)
 
 #MM sound-madoss : workbench-libs-oss-unix
 
-- 
2.11.4.GIT