Commit 2a615a2b authored by Steve Holme's avatar Steve Holme
Browse files

build: Use $(TargetDir) and $(TargetName) macros for VC .lib output files 

As with commit 11397eb6, use $(TargetDir) and $(TargetName) for the
Import Library output rather than $(OutDir)\$(ProjectName)d.lib and
$(OutDir)\$(ProjectName).lib.
parent 11397eb6

projects/Windows/VC10/lib/libcurl.tmpl

+16 −16
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -689,7 +689,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -731,7 +731,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -772,7 +772,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -926,7 +926,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -969,7 +969,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1011,7 +1011,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1052,7 +1052,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1096,7 +1096,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1139,7 +1139,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1181,7 +1181,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1222,7 +1222,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1266,7 +1266,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1309,7 +1309,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1351,7 +1351,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1392,7 +1392,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>

projects/Windows/VC11/lib/libcurl.tmpl

+16 −16
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -729,7 +729,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -771,7 +771,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -812,7 +812,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -966,7 +966,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1009,7 +1009,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1051,7 +1051,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1092,7 +1092,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1136,7 +1136,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1179,7 +1179,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1221,7 +1221,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1262,7 +1262,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1306,7 +1306,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1349,7 +1349,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1391,7 +1391,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1432,7 +1432,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>

projects/Windows/VC12/lib/libcurl.tmpl

+16 −16
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -729,7 +729,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -771,7 +771,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -812,7 +812,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -966,7 +966,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1009,7 +1009,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1051,7 +1051,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1092,7 +1092,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1136,7 +1136,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1179,7 +1179,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1221,7 +1221,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1262,7 +1262,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1306,7 +1306,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1349,7 +1349,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName)d.lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>
@@ -1391,7 +1391,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX86</TargetMachine>

    </Link>

    <Bscmake>
@@ -1432,7 +1432,7 @@ 
      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>

      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>

      <TargetMachine>MachineX64</TargetMachine>

    </Link>

    <Bscmake>

projects/Windows/VC7.1/lib/libcurl.tmpl

+8 −8
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC7.1\DLL Release,..\..\..\..\..\libssh2\build\Win32\VC7.1\DLL Release"

				SetChecksum="TRUE"

				ImportLibrary="$(OutDir)\$(ProjectName).lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="NDEBUG"
@@ -100,7 +100,7 @@ 
				AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC7.1\DLL Debug"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

				ImportLibrary="$(OutDir)\$(ProjectName)d.lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="_DEBUG"
@@ -158,7 +158,7 @@ 
				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

				ImportLibrary="$(OutDir)\$(ProjectName)d.lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="_DEBUG"
@@ -309,7 +309,7 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				SetChecksum="TRUE"

				ImportLibrary="$(OutDir)\$(ProjectName).lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="NDEBUG"
@@ -507,7 +507,7 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				SetChecksum="TRUE"

				ImportLibrary="$(OutDir)\$(ProjectName).lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="NDEBUG"
@@ -565,7 +565,7 @@ 
				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

				ImportLibrary="$(OutDir)\$(ProjectName)d.lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="_DEBUG"
@@ -670,7 +670,7 @@ 
				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC7.1\DLL Release"

				SetChecksum="TRUE"

				ImportLibrary="$(OutDir)\$(ProjectName).lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="NDEBUG"
@@ -964,7 +964,7 @@ 
				AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC7.1\DLL Debug,..\..\..\..\..\libssh2\build\Win32\VC7.1\DLL Debug"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

				ImportLibrary="$(OutDir)\$(ProjectName)d.lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="_DEBUG"

projects/Windows/VC7/lib/libcurl.tmpl

+8 −8
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC7\DLL Release,..\..\..\..\..\libssh2\build\Win32\VC7\DLL Release"

				SetChecksum="TRUE"

				ImportLibrary="$(OutDir)\$(ProjectName).lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="NDEBUG"
@@ -94,7 +94,7 @@ 
				AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC7\DLL Debug"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

				ImportLibrary="$(OutDir)\$(ProjectName)d.lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="_DEBUG"
@@ -146,7 +146,7 @@ 
				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

				ImportLibrary="$(OutDir)\$(ProjectName)d.lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="_DEBUG"
@@ -279,7 +279,7 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				SetChecksum="TRUE"

				ImportLibrary="$(OutDir)\$(ProjectName).lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="NDEBUG"
@@ -453,7 +453,7 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				SetChecksum="TRUE"

				ImportLibrary="$(OutDir)\$(ProjectName).lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="NDEBUG"
@@ -505,7 +505,7 @@ 
				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

				ImportLibrary="$(OutDir)\$(ProjectName)d.lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="_DEBUG"
@@ -598,7 +598,7 @@ 
				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC7\DLL Release"

				SetChecksum="TRUE"

				ImportLibrary="$(OutDir)\$(ProjectName).lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="NDEBUG"
@@ -856,7 +856,7 @@ 
				AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC7\DLL Debug,..\..\..\..\..\libssh2\build\Win32\VC7\DLL Debug"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"

				ImportLibrary="$(OutDir)\$(ProjectName)d.lib"/>

				ImportLibrary="$(TargetDir)$(TargetName).lib"/>

			<Tool

				Name="VCMIDLTool"

				PreprocessorDefinitions="_DEBUG"