openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1847617 - /openoffice/trunk/main/curl/makefile.mk
Date Wed, 28 Nov 2018 06:53:46 GMT
Author: damjan
Date: Wed Nov 28 06:53:46 2018
New Revision: 1847617

URL: http://svn.apache.org/viewvc?rev=1847617&view=rev
Log:
Port main/curl to 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=1847617&r1=1847616&r2=1847617&view=diff
==============================================================================
--- openoffice/trunk/main/curl/makefile.mk (original)
+++ openoffice/trunk/main/curl/makefile.mk Wed Nov 28 06:53:46 2018
@@ -109,8 +109,13 @@ BUILD_ACTION=CC="cl.exe" nmake -f Makefi
 BUILD_ACTION=CC="cl.exe" nmake -f Makefile.vc mode=dll VC=9 DEBUG=yes EXCFLAGS=$(EXCFLAGS)
MACHINE=$(curl_MACHINE)
 .ENDIF
 
+.IF "$(CPUNAME)"=="INTEL"
 OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.dll
 OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.lib
+.ELIF "$(CPUNAME)"=="X86_64"
+OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.lib
+.ENDIF
 
 .ENDIF
 .ENDIF			# "$(GUI)"=="WNT"



Mime
View raw message