WARNING! Gitlab maintenance operation scheduled for Thursday, 18 June between 19:00 and 20:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.

Commit d21b6683 authored Jan 09, 2015 by Guenter Knauf

Merge pull request #134 from vszakats/mingw-m64

add -m64 CFLAGS when targeting mingw64, add -m32/-m64 to LDFLAGS

parents 4e58589b acc8089b

lib/Makefile.m32

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ endif
		endif

		ifeq ($(ARCH),w64)
		CFLAGS += -D_AMD64_
		CFLAGS += -m64 -D_AMD64_
		RCFLAGS += -F pe-x86-64
		else
		CFLAGS += -m32

src/Makefile.m32

+3 −2

Original line number	Diff line number	Diff line
		@@ -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))