From eac17d1b4784a2ba03ce8d8510748df532517d2c Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Wed, 5 Dec 2012 04:32:57 +0000 Subject: [PATCH] Update libcurl names --- msi/WiX/MergeModules/MergeModules.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make index a44e784..0dd95ea 100644 --- a/msi/WiX/MergeModules/MergeModules.make +++ b/msi/WiX/MergeModules/MergeModules.make @@ -23,7 +23,7 @@ Curl-x64.msm: Curl-x64.wixobj light Curl-x64.wixobj del ..\*.msi -Curl-x64.wixobj: Curl-x64.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll +Curl-x64.wixobj: Curl-x64.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl5.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurl5d.dll wixcop -indent:2 Curl-x64.wxs candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) @@ -31,7 +31,7 @@ Curl-x86.msm: Curl-x86.wixobj light Curl-x86.wixobj del ..\*.msi -Curl-x86.wixobj: Curl-x86.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll +Curl-x86.wixobj: Curl-x86.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl5.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurl5d.dll wixcop -indent:2 Curl-x86.wxs candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) -- 2.1.4