diff options
| author | Guenter Knauf <lists@gknw.net> | 2015-01-09 22:03:12 +0100 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2015-01-09 22:03:12 +0100 |
| commit | d21b66835f2af781a3c2a685abc92ef9f0cd86be (patch) | |
| tree | b4124dae98054b392d17276dc23084962cf52c00 | |
| parent | 4e58589b0ea6e656adf8df716dc5597e5d8a0bdf (diff) | |
| parent | acc8089bc20636067d94778b1dec4fb6b81ccffa (diff) | |
| download | curl-d21b66835f2af781a3c2a685abc92ef9f0cd86be.tar.gz | |
Merge pull request #134 from vszakats/mingw-m64
add -m64 CFLAGS when targeting mingw64, add -m32/-m64 to LDFLAGS
| -rw-r--r-- | lib/Makefile.m32 | 2 | ||||
| -rw-r--r-- | src/Makefile.m32 | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index cc3ecf909..92bdb1f0d 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -75,7 +75,7 @@ endif endif ifeq ($(ARCH),w64) -CFLAGS += -D_AMD64_ +CFLAGS += -m64 -D_AMD64_ RCFLAGS += -F pe-x86-64 else CFLAGS += -m32 diff --git a/src/Makefile.m32 b/src/Makefile.m32 index e54175ced..f3f9054f9 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -90,10 +90,12 @@ endif endif ifeq ($(ARCH),w64) -CFLAGS += -D_AMD64_ +CFLAGS += -m64 -D_AMD64_ +LDFLAGS += -m64 RCFLAGS += -F pe-x86-64 else CFLAGS += -m32 +LDFLAGS += -m32 RCFLAGS += -F pe-i386 endif @@ -340,4 +342,3 @@ endif distclean vclean: clean @$(call DEL, $(curl_PROGRAMS)) - |