You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by da...@apache.org on 2018/03/05 05:09:35 UTC

svn commit: r1825850 - /openoffice/trunk/main/curl/makefile.mk

Author: damjan
Date: Mon Mar  5 05:09:34 2018
New Revision: 1825850

URL: http://svn.apache.org/viewvc?rev=1825850&view=rev
Log:
Get main/curl to build 64 bit binaries on Win64.

Patch by: me


Modified:
    openoffice/trunk/main/curl/makefile.mk

Modified: openoffice/trunk/main/curl/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/curl/makefile.mk?rev=1825850&r1=1825849&r2=1825850&view=diff
==============================================================================
--- openoffice/trunk/main/curl/makefile.mk (original)
+++ openoffice/trunk/main/curl/makefile.mk Mon Mar  5 05:09:34 2018
@@ -107,11 +107,17 @@ EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SEC
 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