[Libreoffice-commits] core.git: Branch 'aoo/trunk' - curl/makefile.mk

[Damjan Jovanovic]

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

New commits:
commit f57ea524e269128fbd6ff21e212e46f1248740b0
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Mar 5 05:09:34 2018 +0000

    Get main/curl to build 64 bit binaries on Win64.
    
    Patch by: me

diff --git a/curl/makefile.mk b/curl/makefile.mk
index 273b187b4633..0dcef1d53d15 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -107,11 +107,17 @@ EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE""
 EXCFLAGS="/EHsc /YX"
 .ENDIF
 
+.IF "$(CPUNAME)"=="INTEL"
+curl_MACHINE:="X86"
+.ELIF "$(CPUNAME)"=="X86_64"
+curl_MACHINE:="X64"
+.ENDIF
+
 BUILD_DIR=.$/lib
 .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=$(curl_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=$(curl_MACHINE)
 .ENDIF
 
 OUT2BIN=$(BUILD_DIR)$/libcurl.dll