[Libreoffice-commits] .: curl/makefile.mk

Tor Lillqvist tml at kemper.freedesktop.org
Mon Jan 24 02:04:36 PST 2011


 curl/makefile.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 8b8705e0aed42d2c751f207f14c8fdc3fbe20cd5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jan 24 12:04:25 2011 +0200

    Fix curl build on x64 Windows

diff --git a/curl/makefile.mk b/curl/makefile.mk
index 213a887..31abb8d 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -122,6 +122,13 @@ EXCFLAGS="/EHsc /YX"
 .ENDIF
 
 BUILD_DIR=.$/lib
+
+.IF "$(CPU)" == "I"
+MACHINE=X86
+.ELSE
+MACHINE=X64
+.ENDIF
+
 .IF "$(debug)"==""
 BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS)
 .ELSE


More information about the Libreoffice-commits mailing list