[cpp-sp] 03/06: Fix lib paths for Win32 build
Rod Widdowson
rdw at steadingsoftware.com
Tue Jan 21 14:17:32 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=a8457f30e7afce49aa259719587d26521e74407b
commit a8457f30e7afce49aa259719587d26521e74407b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 20 20:26:51 2025 +0000
Fix lib paths for Win32 build
---
Projects/vc22/Apache.vcxproj | 26 +++++++++++++-------------
Projects/vc22/Tests.vcxproj | 18 ++++++++++++------
Projects/vc22/iis.vcxproj | 18 ++++++++++++------
3 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/Projects/vc22/Apache.vcxproj b/Projects/vc22/Apache.vcxproj
index 042c6a3c..bb80eded 100644
--- a/Projects/vc22/Apache.vcxproj
+++ b/Projects/vc22/Apache.vcxproj
@@ -105,27 +105,27 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<IncludePath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\include;$(SolutionDir)..\..\..\boost;$(SolutionDir)..\..\;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<IncludePath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\include;$(SolutionDir)..\..\..\boost;$(SolutionDir)..\..\;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\include;$(SolutionDir)..\..\..\boost;$(SolutionDir)..\..\;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(SolutionDir)$(Configuration)\;$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\include;$(SolutionDir)..\..\..\boost;$(SolutionDir)..\..\;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(SolutionDir)$(Configuration)\;$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\include;$(SolutionDir)..\..\..\boost;$(SolutionDir)..\..\;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\include;$(SolutionDir)..\..\..\boost;$(SolutionDir)..\..\;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(SolutionDir)..\..\..\apache\Apache24-$(Platform)\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -141,7 +141,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
@@ -166,7 +166,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>
@@ -188,7 +188,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>
@@ -210,7 +210,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
@@ -235,7 +235,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>
@@ -261,7 +261,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
@@ -271,4 +271,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc22/Tests.vcxproj b/Projects/vc22/Tests.vcxproj
index b0fd699c..61fef101 100644
--- a/Projects/vc22/Tests.vcxproj
+++ b/Projects/vc22/Tests.vcxproj
@@ -109,21 +109,27 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(SolutionDir)..\..\..\boost_1_80_0;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>$(SolutionDir)..\..\..\boost_1_80_0;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>$(SolutionDir)..\..\..\boost_1_80_0;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<IncludePath>$(SolutionDir)..\..\..\boost_1_80_0;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>$(SolutionDir)..\..\..\boost_1_80_0;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<IncludePath>$(SolutionDir)..\..\..\boost_1_80_0;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -136,7 +142,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -154,7 +160,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -168,7 +174,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -182,7 +188,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -200,7 +206,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -218,7 +224,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/Projects/vc22/iis.vcxproj b/Projects/vc22/iis.vcxproj
index 5b5eb235..cc7d0a3f 100644
--- a/Projects/vc22/iis.vcxproj
+++ b/Projects/vc22/iis.vcxproj
@@ -114,21 +114,27 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<IncludePath>$(SolutionDir)..\..\..\boost\;$(SolutionDir)..\..\;$(SolutionDir)..\..\iis7_shib;$(SolutionDir)..\..\iis7_shib\headers;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -141,7 +147,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -163,7 +169,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -181,7 +187,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -199,7 +205,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -221,7 +227,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -243,7 +249,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list