From d9efd369071d3feb0433cc128cc7a8f63fc871bd Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 26 Jul 2015 20:44:17 +0100 Subject: build: Use $(ProjectName) macro for curl.exe and curld.exe filenames This wasn't possible with the old curlsrc project filenames, but like commit 2a615a2b64 and 11397eb6dd for libcurl use the built in Visual Studio macros for the output filenames. --- projects/Windows/VC10/src/curl.tmpl | 96 ++++++++++++++++++------------------ projects/Windows/VC11/src/curl.tmpl | 96 ++++++++++++++++++------------------ projects/Windows/VC12/src/curl.tmpl | 96 ++++++++++++++++++------------------ projects/Windows/VC7.1/src/curl.tmpl | 48 +++++++++--------- projects/Windows/VC7/src/curl.tmpl | 48 +++++++++--------- projects/Windows/VC8/src/curl.tmpl | 96 ++++++++++++++++++------------------ projects/Windows/VC9/src/curl.tmpl | 96 ++++++++++++++++++------------------ 7 files changed, 288 insertions(+), 288 deletions(-) diff --git a/projects/Windows/VC10/src/curl.tmpl b/projects/Windows/VC10/src/curl.tmpl index 3e22d8f27..48f1ce0ef 100644 --- a/projects/Windows/VC10/src/curl.tmpl +++ b/projects/Windows/VC10/src/curl.tmpl @@ -733,54 +733,54 @@ $(OutDir)src\ false false - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) diff --git a/projects/Windows/VC11/src/curl.tmpl b/projects/Windows/VC11/src/curl.tmpl index a81f8f9dd..026f6fe86 100644 --- a/projects/Windows/VC11/src/curl.tmpl +++ b/projects/Windows/VC11/src/curl.tmpl @@ -781,54 +781,54 @@ $(OutDir)src\ false false - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) diff --git a/projects/Windows/VC12/src/curl.tmpl b/projects/Windows/VC12/src/curl.tmpl index b336cdd18..b1b769b4a 100644 --- a/projects/Windows/VC12/src/curl.tmpl +++ b/projects/Windows/VC12/src/curl.tmpl @@ -781,54 +781,54 @@ $(OutDir)src\ false false - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curld - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl - curl + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName)d + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) diff --git a/projects/Windows/VC7.1/src/curl.tmpl b/projects/Windows/VC7.1/src/curl.tmpl index 031c228b6..043c03a90 100644 --- a/projects/Windows/VC7.1/src/curl.tmpl +++ b/projects/Windows/VC7.1/src/curl.tmpl @@ -35,7 +35,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="crypt32.lib wldap32.lib ws2_32.lib libcurl.lib libeay32.lib ssleay32.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7.1\LIB Release" @@ -90,7 +90,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -145,7 +145,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -200,7 +200,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib libeay32.lib ssleay32.lib libssh2d.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7.1\DLL Debug,..\..\..\..\..\libssh2\build\Win32\VC7.1\DLL Debug" @@ -257,7 +257,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="crypt32.lib wldap32.lib ws2_32.lib libcurld.lib libeay32.lib ssleay32.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7.1\LIB Debug" @@ -314,7 +314,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -371,7 +371,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="crypt32.lib wldap32.lib ws2_32.lib libcurld.lib libeay32.lib ssleay32.lib libssh2d.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7.1\LIB Debug,..\..\..\..\..\libssh2\build\Win32\VC7.1\LIB Debug" @@ -428,7 +428,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib libeay32.lib ssleay32.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7.1\DLL Release" @@ -483,7 +483,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib libeay32.lib ssleay32.lib libssh2.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7.1\DLL Release,..\..\..\..\..\libssh2\build\Win32\VC7.1\DLL Release" @@ -538,7 +538,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -593,7 +593,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="crypt32.lib wldap32.lib ws2_32.lib libcurl.lib libeay32.lib ssleay32.lib libssh2.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7.1\LIB Release,..\..\..\..\..\libssh2\build\Win32\VC7.1\LIB Release" @@ -648,7 +648,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib libeay32.lib ssleay32.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7.1\DLL Debug" @@ -705,7 +705,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -762,7 +762,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -819,7 +819,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -874,7 +874,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -929,7 +929,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -986,7 +986,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -1043,7 +1043,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -1098,7 +1098,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -1155,7 +1155,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -1212,7 +1212,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -1267,7 +1267,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="normaliz.lib wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" @@ -1324,7 +1324,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="normaliz.lib wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7.1\$(ConfigurationName)" diff --git a/projects/Windows/VC7/src/curl.tmpl b/projects/Windows/VC7/src/curl.tmpl index 899507693..783b530bb 100644 --- a/projects/Windows/VC7/src/curl.tmpl +++ b/projects/Windows/VC7/src/curl.tmpl @@ -35,7 +35,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="crypt32.lib wldap32.lib ws2_32.lib libcurl.lib libeay32.lib ssleay32.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7\LIB Release" @@ -84,7 +84,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -133,7 +133,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -182,7 +182,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib libeay32.lib ssleay32.lib libssh2d.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7\DLL Debug,..\..\..\..\..\libssh2\build\Win32\VC7\DLL Debug" @@ -233,7 +233,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="crypt32.lib wldap32.lib ws2_32.lib libcurld.lib libeay32.lib ssleay32.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7\LIB Debug" @@ -284,7 +284,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -335,7 +335,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="crypt32.lib wldap32.lib ws2_32.lib libcurld.lib libeay32.lib ssleay32.lib libssh2d.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7\LIB Debug,..\..\..\..\..\libssh2\build\Win32\VC7\LIB Debug" @@ -386,7 +386,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib libeay32.lib ssleay32.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7\DLL Release" @@ -435,7 +435,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib libeay32.lib ssleay32.lib libssh2.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7\DLL Release,..\..\..\..\..\libssh2\build\Win32\VC7\DLL Release" @@ -484,7 +484,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -533,7 +533,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="crypt32.lib wldap32.lib ws2_32.lib libcurl.lib libeay32.lib ssleay32.lib libssh2.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7\LIB Release,..\..\..\..\..\libssh2\build\Win32\VC7\LIB Release" @@ -582,7 +582,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib libeay32.lib ssleay32.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName),..\..\..\..\..\openssl\build\Win32\VC7\DLL Debug" @@ -633,7 +633,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -684,7 +684,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -735,7 +735,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -784,7 +784,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -833,7 +833,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -884,7 +884,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -935,7 +935,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -984,7 +984,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -1035,7 +1035,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -1086,7 +1086,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -1135,7 +1135,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="normaliz.lib wldap32.lib ws2_32.lib libcurld.lib" - OutputFile="$(OutDir)\curld.exe" + OutputFile="$(OutDir)\$(ProjectName)d.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" @@ -1186,7 +1186,7 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 /FIXED:NO" AdditionalDependencies="normaliz.lib wldap32.lib ws2_32.lib libcurl.lib" - OutputFile="$(OutDir)\curl.exe" + OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\..\..\build\Win32\VC7\$(ConfigurationName)" diff --git a/projects/Windows/VC8/src/curl.tmpl b/projects/Windows/VC8/src/curl.tmpl index e429bce53..9f98ff6b7 100644 --- a/projects/Windows/VC8/src/curl.tmpl +++ b/projects/Windows/VC8/src/curl.tmpl @@ -69,7 +69,7 @@