build: in Makefile.m32 simplify platform flags.

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 2b23a40eee6c587d7a42ef32e42d9972d16789a4..2ce597320720933030954ffb57726e7a19bb0c9a 100644 (file)
--- 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 5cacade5719212a9e0d3778305ec791311fbb800..707b5bc2adf05aa6c2fb6dfc746b65996b36da6b 100644 (file)
--- 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