From 140ca2dcc28ae201c7fd6deb393dc4bd7c80a051 Mon Sep 17 00:00:00 2001
From: Guenter Knauf <lists@gknw.net>
Date: Wed, 19 Nov 2014 11:46:02 +0100
Subject: build: in Makefile.m32 simplify platform flags.

---
 lib/Makefile.m32 | 14 ++++++--------
 src/Makefile.m32 | 18 ++++++++----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 2b23a40ee..2ce597320 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -67,23 +67,21 @@ endif
 CC	= $(CROSSPREFIX)gcc
 CFLAGS	= -g -O2 -Wall
 CFLAGS	+= -fno-strict-aliasing
-ifeq ($(ARCH),w64)
-CFLAGS	+= -D_AMD64_
-else
-CFLAGS	+= -m32
-endif
 # comment LDFLAGS below to keep debug info
 LDFLAGS	= -s
 AR	= $(CROSSPREFIX)ar
 RANLIB	= $(CROSSPREFIX)ranlib
 RC	= $(CROSSPREFIX)windres
 RCFLAGS	= --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF
+STRIP	= $(CROSSPREFIX)strip -g
+
 ifeq ($(ARCH),w64)
-RCFLAGS	+= -F pe-x86-64
+CFLAGS  += -D_AMD64_
+RCFLAGS += -F pe-x86-64
 else
-RCFLAGS	+= -F pe-i386
+CFLAGS  += -m32
+RCFLAGS += -F pe-i386
 endif
-STRIP	= $(CROSSPREFIX)strip -g
 
 # Platform-dependent helper tool macros
 ifeq ($(findstring /sh,$(SHELL)),/sh)
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 5cacade57..707b5bc2a 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -79,27 +79,25 @@ endif
 CC	= $(CROSSPREFIX)gcc
 CFLAGS	= -g -O2 -Wall
 CFLAGS	+= -fno-strict-aliasing
-ifeq ($(ARCH),w64)
-CFLAGS	+= -D_AMD64_
-else
-CFLAGS	+= -m32
-endif
 # comment LDFLAGS below to keep debug info
 LDFLAGS	= -s
 AR	= $(CROSSPREFIX)ar
 RC	= $(CROSSPREFIX)windres
 RCFLAGS	= --include-dir=$(PROOT)/include -O COFF
-ifeq ($(ARCH),w64)
-RCFLAGS += -F pe-x86-64
-else
-RCFLAGS += -F pe-i386
-endif
 STRIP   = $(CROSSPREFIX)strip -g
 
 # We may need these someday
 # PERL = perl
 # NROFF = nroff
 
+ifeq ($(ARCH),w64)
+CFLAGS	+= -D_AMD64_
+RCFLAGS += -F pe-x86-64
+else
+CFLAGS	+= -m32
+RCFLAGS += -F pe-i386
+endif
+
 # Platform-dependent helper tool macros
 ifeq ($(findstring /sh,$(SHELL)),/sh)
 DEL	= rm -f $1
-- 
cgit v1.2.3