mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
add -m64 clags when targeting mingw64, add -m32/-m64 to LDFLAGS
This commit is contained in:
parent
34636fa47e
commit
acc8089bc2
@ -75,7 +75,7 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(ARCH),w64)
|
ifeq ($(ARCH),w64)
|
||||||
CFLAGS += -D_AMD64_
|
CFLAGS += -m64 -D_AMD64_
|
||||||
RCFLAGS += -F pe-x86-64
|
RCFLAGS += -F pe-x86-64
|
||||||
else
|
else
|
||||||
CFLAGS += -m32
|
CFLAGS += -m32
|
||||||
@ -323,5 +323,3 @@ $(PROOT)/include/curl/curlbuild.h:
|
|||||||
|
|
||||||
$(LIBCARES_PATH)/libcares.a:
|
$(LIBCARES_PATH)/libcares.a:
|
||||||
$(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32
|
$(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32
|
||||||
|
|
||||||
|
|
||||||
|
@ -90,10 +90,12 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(ARCH),w64)
|
ifeq ($(ARCH),w64)
|
||||||
CFLAGS += -D_AMD64_
|
CFLAGS += -m64 -D_AMD64_
|
||||||
|
LDFLAGS += -m64
|
||||||
RCFLAGS += -F pe-x86-64
|
RCFLAGS += -F pe-x86-64
|
||||||
else
|
else
|
||||||
CFLAGS += -m32
|
CFLAGS += -m32
|
||||||
|
LDFLAGS += -m32
|
||||||
RCFLAGS += -F pe-i386
|
RCFLAGS += -F pe-i386
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -340,4 +342,3 @@ endif
|
|||||||
|
|
||||||
distclean vclean: clean
|
distclean vclean: clean
|
||||||
@$(call DEL, $(curl_PROGRAMS))
|
@$(call DEL, $(curl_PROGRAMS))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user