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

[Tor Lillqvist]

 curl/makefile.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c5c08dee0f577a07fe70065615658c72520d134d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jan 24 12:26:44 2011 +0200

    Actually pass the MACHINE parameter to nmake

diff --git a/curl/makefile.mk b/curl/makefile.mk
index 31abb8d..8e95621 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -130,9 +130,9 @@ MACHINE=X64
 .ENDIF
 
 .IF "$(debug)"==""
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS)
+BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
 .ELSE
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS)
+BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
 .ENDIF
 
 OUT2BIN=$(BUILD_DIR)$/libcurl.dll