From 2a615a2b649cc13b1ba39349453a8f2dc098bfd3 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Wed, 28 May 2014 22:12:44 +0100
Subject: build: Use $(TargetDir) and $(TargetName) macros for VC .lib output
 files

As with commit 11397eb6dd, use $(TargetDir) and $(TargetName) for the
Import Library output rather than $(OutDir)\$(ProjectName)d.lib and
$(OutDir)\$(ProjectName).lib.
---
 projects/Windows/VC7/lib/libcurl.tmpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'projects/Windows/VC7/lib/libcurl.tmpl')

diff --git a/projects/Windows/VC7/lib/libcurl.tmpl b/projects/Windows/VC7/lib/libcurl.tmpl
index a37571815..a6243500c 100644
--- a/projects/Windows/VC7/lib/libcurl.tmpl
+++ b/projects/Windows/VC7/lib/libcurl.tmpl
@@ -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"
-- 
cgit v1.2.3