moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

build: in Makefile.m32 simplify platform flags.

Browse Source
This commit is contained in:
Guenter Knauf 2014-11-19 11:46:02 +01:00
parent a08decdfed
commit 140ca2dcc2
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Makefile.m32
View File

@ -67,24 +67,22 @@ endif
CC = $(CROSSPREFIX)gcc CC = $(CROSSPREFIX)gcc
CFLAGS = -g -O2 -Wall CFLAGS = -g -O2 -Wall
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing
ifeq ($(ARCH),w64)
CFLAGS += -D_AMD64_
else
CFLAGS += -m32
endif
# comment LDFLAGS below to keep debug info # comment LDFLAGS below to keep debug info
LDFLAGS = -s LDFLAGS = -s
AR = $(CROSSPREFIX)ar AR = $(CROSSPREFIX)ar
RANLIB = $(CROSSPREFIX)ranlib RANLIB = $(CROSSPREFIX)ranlib
RC = $(CROSSPREFIX)windres RC = $(CROSSPREFIX)windres
RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF
ifeq ($(ARCH),w64)
RCFLAGS += -F pe-x86-64
else
RCFLAGS += -F pe-i386
endif
STRIP = $(CROSSPREFIX)strip -g STRIP = $(CROSSPREFIX)strip -g
ifeq ($(ARCH),w64)
CFLAGS += -D_AMD64_
RCFLAGS += -F pe-x86-64
else
CFLAGS += -m32
RCFLAGS += -F pe-i386
endif
# Platform-dependent helper tool macros # Platform-dependent helper tool macros
ifeq ($(findstring /sh,$(SHELL)),/sh) ifeq ($(findstring /sh,$(SHELL)),/sh)
DEL = rm -f $1 DEL = rm -f $1

18
src/Makefile.m32
View File

@ -79,27 +79,25 @@ endif
CC = $(CROSSPREFIX)gcc CC = $(CROSSPREFIX)gcc
CFLAGS = -g -O2 -Wall CFLAGS = -g -O2 -Wall
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing
ifeq ($(ARCH),w64)
CFLAGS += -D_AMD64_
else
CFLAGS += -m32
endif
# comment LDFLAGS below to keep debug info # comment LDFLAGS below to keep debug info
LDFLAGS = -s LDFLAGS = -s
AR = $(CROSSPREFIX)ar AR = $(CROSSPREFIX)ar
RC = $(CROSSPREFIX)windres RC = $(CROSSPREFIX)windres
RCFLAGS = --include-dir=$(PROOT)/include -O COFF 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 STRIP = $(CROSSPREFIX)strip -g
# We may need these someday # We may need these someday
# PERL = perl # PERL = perl
# NROFF = nroff # 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 # Platform-dependent helper tool macros
ifeq ($(findstring /sh,$(SHELL)),/sh) ifeq ($(findstring /sh,$(SHELL)),/sh)
DEL = rm -f $1 DEL = rm -f $1