From 11397eb6dd44457d7b0c1a83b539f800dff971d2 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Wed, 28 May 2014 21:46:57 +0100 Subject: 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. --- projects/Windows/VC10/lib/libcurl.tmpl | 16 ++++++++-------- projects/Windows/VC11/lib/libcurl.tmpl | 16 ++++++++-------- projects/Windows/VC12/lib/libcurl.tmpl | 16 ++++++++-------- projects/Windows/VC7.1/lib/libcurl.tmpl | 8 ++++---- projects/Windows/VC7/lib/libcurl.tmpl | 8 ++++---- projects/Windows/VC8/lib/libcurl.tmpl | 16 ++++++++-------- projects/Windows/VC9/lib/libcurl.tmpl | 16 ++++++++-------- 7 files changed, 48 insertions(+), 48 deletions(-) (limited to 'projects/Windows') diff --git a/projects/Windows/VC10/lib/libcurl.tmpl b/projects/Windows/VC10/lib/libcurl.tmpl index 0daa42d89..53e4766d3 100644 --- a/projects/Windows/VC10/lib/libcurl.tmpl +++ b/projects/Windows/VC10/lib/libcurl.tmpl @@ -642,7 +642,7 @@ %(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -685,7 +685,7 @@ true %(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -922,7 +922,7 @@ ..\..\..\..\..\openssl\build\Win32\VC10\DLL Debug;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -965,7 +965,7 @@ true ..\..\..\..\..\openssl\build\Win64\VC10\DLL Debug;%(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1092,7 +1092,7 @@ %(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1135,7 +1135,7 @@ true %(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1262,7 +1262,7 @@ ..\..\..\..\..\openssl\build\Win32\VC10\DLL Debug;..\..\..\..\..\libssh2\build\Win32\VC10\DLL Debug;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1305,7 +1305,7 @@ true ..\..\..\..\..\openssl\build\Win64\VC10\DLL Debug;..\..\..\..\..\libssh2\build\Win64\VC10\DLL Debug;%(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false diff --git a/projects/Windows/VC11/lib/libcurl.tmpl b/projects/Windows/VC11/lib/libcurl.tmpl index 46c8069d3..749bdce72 100644 --- a/projects/Windows/VC11/lib/libcurl.tmpl +++ b/projects/Windows/VC11/lib/libcurl.tmpl @@ -682,7 +682,7 @@ %(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -725,7 +725,7 @@ true %(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -962,7 +962,7 @@ ..\..\..\..\..\openssl\build\Win32\VC11\DLL Debug;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1005,7 +1005,7 @@ true ..\..\..\..\..\openssl\build\Win64\VC11\DLL Debug;%(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1132,7 +1132,7 @@ %(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1175,7 +1175,7 @@ true %(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1302,7 +1302,7 @@ ..\..\..\..\..\openssl\build\Win32\VC11\DLL Debug;..\..\..\..\..\libssh2\build\Win32\VC11\DLL Debug;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1345,7 +1345,7 @@ true ..\..\..\..\..\openssl\build\Win64\VC11\DLL Debug;..\..\..\..\..\libssh2\build\Win64\VC11\DLL Debug;%(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false diff --git a/projects/Windows/VC12/lib/libcurl.tmpl b/projects/Windows/VC12/lib/libcurl.tmpl index ad0e00643..f765ad24e 100644 --- a/projects/Windows/VC12/lib/libcurl.tmpl +++ b/projects/Windows/VC12/lib/libcurl.tmpl @@ -682,7 +682,7 @@ %(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -725,7 +725,7 @@ true %(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -962,7 +962,7 @@ ..\..\..\..\..\openssl\build\Win32\VC12\DLL Debug;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1005,7 +1005,7 @@ true ..\..\..\..\..\openssl\build\Win64\VC12\DLL Debug;%(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1132,7 +1132,7 @@ %(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1175,7 +1175,7 @@ true %(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1302,7 +1302,7 @@ ..\..\..\..\..\openssl\build\Win32\VC12\DLL Debug;..\..\..\..\..\libssh2\build\Win32\VC12\DLL Debug;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false @@ -1345,7 +1345,7 @@ true ..\..\..\..\..\openssl\build\Win64\VC12\DLL Debug;..\..\..\..\..\libssh2\build\Win64\VC12\DLL Debug;%(AdditionalLibraryDirectories) true - $(OutDir)$(ProjectName)d.pdb + $(TargetDir)$(TargetName).pdb false diff --git a/projects/Windows/VC7.1/lib/libcurl.tmpl b/projects/Windows/VC7.1/lib/libcurl.tmpl index 1b935ddaa..80f921abb 100644 --- a/projects/Windows/VC7.1/lib/libcurl.tmpl +++ b/projects/Windows/VC7.1/lib/libcurl.tmpl @@ -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"/> @@ -171,7 +171,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" TargetMachine="17" /> @@ -727,7 +727,7 @@ AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC8\DLL Debug" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" TargetMachine="1" /> @@ -819,7 +819,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win64\VC8\DLL Debug" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" TargetMachine="17" /> @@ -1093,7 +1093,7 @@ AdditionalLibraryDirectories="" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" TargetMachine="1" /> @@ -1185,7 +1185,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" TargetMachine="17" /> @@ -1459,7 +1459,7 @@ AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC8\DLL Debug;..\..\..\..\..\libssh2\build\Win32\VC8\DLL Debug" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" TargetMachine="1" /> @@ -1551,7 +1551,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win64\VC8\DLL Debug;..\..\..\..\..\libssh2\build\Win64\VC8\DLL Debug" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" TargetMachine="17" /> diff --git a/projects/Windows/VC9/lib/libcurl.tmpl b/projects/Windows/VC9/lib/libcurl.tmpl index 515719902..ee01d2815 100644 --- a/projects/Windows/VC9/lib/libcurl.tmpl +++ b/projects/Windows/VC9/lib/libcurl.tmpl @@ -80,7 +80,7 @@ AdditionalLibraryDirectories="" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" @@ -171,7 +171,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" @@ -724,7 +724,7 @@ AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC9\DLL Debug" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" @@ -815,7 +815,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win64\VC9\DLL Debug" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" @@ -1086,7 +1086,7 @@ AdditionalLibraryDirectories="" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" @@ -1177,7 +1177,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" @@ -1448,7 +1448,7 @@ AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win32\VC9\DLL Debug;..\..\..\..\..\libssh2\build\Win32\VC9\DLL Debug" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" @@ -1539,7 +1539,7 @@ SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\openssl\build\Win64\VC9\DLL Debug;..\..\..\..\..\libssh2\build\Win64\VC9\DLL Debug" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)\$(ProjectName)d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\$(ProjectName)d.lib" -- cgit v1.2.3