Commit 11397eb6 authored by Steve Holme's avatar Steve Holme
Browse files

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

Like with the curl tool project files use $(TargetDir)$(TargetName).pdb
rather than $(OutDir)$(ProjectName)d.pdb for the Program Database File
output.
parent b99f8e8b

projects/Windows/VC10/lib/libcurl.tmpl

+8 −8
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ 
      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -685,7 +685,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -922,7 +922,7 @@ 
      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC10\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -965,7 +965,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC10\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1092,7 +1092,7 @@ 
      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1135,7 +1135,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1262,7 +1262,7 @@ 
      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC10\DLL Debug;..\..\..\..\..\libssh2\build\Win32\VC10\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1305,7 +1305,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC10\DLL Debug;..\..\..\..\..\libssh2\build\Win64\VC10\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

projects/Windows/VC11/lib/libcurl.tmpl

+8 −8
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ 
      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -725,7 +725,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -962,7 +962,7 @@ 
      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC11\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1005,7 +1005,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC11\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1132,7 +1132,7 @@ 
      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1175,7 +1175,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1302,7 +1302,7 @@ 
      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC11\DLL Debug;..\..\..\..\..\libssh2\build\Win32\VC11\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1345,7 +1345,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC11\DLL Debug;..\..\..\..\..\libssh2\build\Win64\VC11\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

projects/Windows/VC12/lib/libcurl.tmpl

+8 −8
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ 
      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -725,7 +725,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -962,7 +962,7 @@ 
      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC12\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1005,7 +1005,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC12\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1132,7 +1132,7 @@ 
      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1175,7 +1175,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1302,7 +1302,7 @@ 
      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win32\VC12\DLL Debug;..\..\..\..\..\libssh2\build\Win32\VC12\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>
@@ -1345,7 +1345,7 @@ 
      <SuppressStartupBanner>true</SuppressStartupBanner>

      <AdditionalLibraryDirectories>..\..\..\..\..\openssl\build\Win64\VC12\DLL Debug;..\..\..\..\..\libssh2\build\Win64\VC12\DLL Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>true</GenerateDebugInformation>

      <ProgramDatabaseFile>$(OutDir)$(ProjectName)d.pdb</ProgramDatabaseFile>

      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

      <RandomizedBaseAddress>false</RandomizedBaseAddress>

      <DataExecutionPrevention>

      </DataExecutionPrevention>

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

+4 −4
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
				SuppressStartupBanner="TRUE"

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

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb"

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

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

			<Tool

				Name="VCMIDLTool"
@@ -157,7 +157,7 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb"

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

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

			<Tool

				Name="VCMIDLTool"
@@ -564,7 +564,7 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb"

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

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

			<Tool

				Name="VCMIDLTool"
@@ -963,7 +963,7 @@ 
				SuppressStartupBanner="TRUE"

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

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb"

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

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

			<Tool

				Name="VCMIDLTool"

projects/Windows/VC7/lib/libcurl.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
				SuppressStartupBanner="TRUE"

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

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb"

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

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

			<Tool

				Name="VCMIDLTool"
@@ -145,7 +145,7 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb"

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

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

			<Tool

				Name="VCMIDLTool"
@@ -504,7 +504,7 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb"

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

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

			<Tool

				Name="VCMIDLTool"
@@ -855,7 +855,7 @@ 
				SuppressStartupBanner="TRUE"

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

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb"

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

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

			<Tool

				Name="VCMIDLTool"