Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

makefile.m32: add support for custom ARCH [ci skip] #9092

Closed
wants to merge 1 commit into from
Closed

makefile.m32: add support for custom ARCH [ci skip] #9092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/examples/Makefile.m32
View file
Open in desktop
Expand Up @@ -118,7 +118,7 @@ CC = $(CURL_CC)
CFLAGS = -O3 $(CURL_CFLAG_EXTRAS) -W -Wall
LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_EXE)
RC = $(CROSSPREFIX)windres
RCFLAGS = --include-dir=$(PROOT)/include -O coff
RCFLAGS = --include-dir=$(PROOT)/include -O coff $(CURL_RCFLAG_EXTRAS)

# Set environment var ARCH to your architecture to override autodetection.
ifndef ARCH
Expand All @@ -129,6 +129,7 @@ ARCH = w32
endif
endif

ifneq ($(ARCH),custom)
ifeq ($(ARCH),w64)
CFLAGS += -m64
LDFLAGS += -m64
Expand All @@ -138,6 +139,7 @@ CFLAGS += -m32
LDFLAGS += -m32
RCFLAGS += -F pe-i386
endif
endif

# Platform-dependent helper tool macros
ifeq ($(findstring /sh,$(SHELL)),/sh)
Expand Down
4 changes: 3 additions & 1 deletion lib/Makefile.m32
View file
Open in desktop
Expand Up @@ -115,7 +115,7 @@ LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL)
AR = $(CURL_AR)
RANLIB = $(CURL_RANLIB)
RC = $(CROSSPREFIX)windres
RCFLAGS = --include-dir=$(PROOT)/include -O coff
RCFLAGS = --include-dir=$(PROOT)/include -O coff $(CURL_RCFLAG_EXTRAS)
STRIP = $(CROSSPREFIX)strip -g

# Set environment var ARCH to your architecture to override autodetection.
Expand All @@ -127,6 +127,7 @@ ARCH = w32
endif
endif

ifneq ($(ARCH),custom)
ifeq ($(ARCH),w64)
CFLAGS += -m64
LDFLAGS += -m64
Expand All @@ -136,6 +137,7 @@ CFLAGS += -m32
LDFLAGS += -m32
RCFLAGS += -F pe-i386
endif
endif

# Platform-dependent helper tool macros
ifeq ($(findstring /sh,$(SHELL)),/sh)
Expand Down
4 changes: 3 additions & 1 deletion src/Makefile.m32
View file
Open in desktop
Expand Up @@ -119,7 +119,7 @@ CFLAGS = -O3 $(CURL_CFLAG_EXTRAS) -W -Wall
LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_EXE)
AR = $(CURL_AR)
RC = $(CROSSPREFIX)windres
RCFLAGS = --include-dir=$(PROOT)/include -O coff -DCURL_EMBED_MANIFEST
RCFLAGS = --include-dir=$(PROOT)/include -O coff -DCURL_EMBED_MANIFEST $(CURL_RCFLAG_EXTRAS)
STRIP = $(CROSSPREFIX)strip -g

# We may need these someday
Expand All @@ -135,6 +135,7 @@ ARCH = w32
endif
endif

ifneq ($(ARCH),custom)
ifeq ($(ARCH),w64)
CFLAGS += -m64
LDFLAGS += -m64
Expand All @@ -144,6 +145,7 @@ CFLAGS += -m32
LDFLAGS += -m32
RCFLAGS += -F pe-i386
endif
endif

# Platform-dependent helper tool macros
ifeq ($(findstring /sh,$(SHELL)),/sh)
Expand Down