Commit 140ca2dc authored by Guenter Knauf's avatar Guenter Knauf
Browse files

build: in Makefile.m32 simplify platform flags.

parent a08decdf
Loading
Loading
Loading
Loading
+6 −8
Original line number Diff line number Diff line
@@ -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)
CFLAGS  += -D_AMD64_
RCFLAGS += -F pe-x86-64
else
CFLAGS  += -m32
RCFLAGS += -F pe-i386
endif
STRIP	= $(CROSSPREFIX)strip -g

# Platform-dependent helper tool macros
ifeq ($(findstring /sh,$(SHELL)),/sh)
+8 −10
Original line number Diff line number Diff line
@@ -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