diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-05-28 22:12:44 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-05-28 23:12:58 +0100 |
| commit | 2a615a2b649cc13b1ba39349453a8f2dc098bfd3 (patch) | |
| tree | 75fd3269b2d1e0f2d8616ba4e65955648620d6e6 /projects/Windows/VC10 | |
| parent | 11397eb6dd44457d7b0c1a83b539f800dff971d2 (diff) | |
| download | curl-2a615a2b649cc13b1ba39349453a8f2dc098bfd3.tar.gz | |
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.
Diffstat (limited to 'projects/Windows/VC10')
| -rw-r--r-- | projects/Windows/VC10/lib/libcurl.tmpl | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/projects/Windows/VC10/lib/libcurl.tmpl b/projects/Windows/VC10/lib/libcurl.tmpl index 53e4766d3..4d8d02b8b 100644 --- a/projects/Windows/VC10/lib/libcurl.tmpl +++ b/projects/Windows/VC10/lib/libcurl.tmpl @@ -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> |