[cpp-sp] 02/03: Windows build: Clean up Resource file
Rod Widdowson
rdw at steadingsoftware.com
Thu Jan 16 14:24:47 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=a8eb407bcefdf8cd67c417a2a0e47d34d827489c
commit a8eb407bcefdf8cd67c417a2a0e47d34d827489c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jan 16 14:04:28 2025 +0000
Windows build: Clean up Resource file
Move the definition of RC_FILE_VERSION and RC_PRODUCT_VERSION
to the top level of the resource compliation (apache) and add
it to the same place for IIS.
---
Projects/vc22/Apache.vcxproj | 31 +++++++++++++++++++++----------
Projects/vc22/iis.vcxproj | 12 ++++++++++++
2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/Projects/vc22/Apache.vcxproj b/Projects/vc22/Apache.vcxproj
index 189084ad..1eb81914 100644
--- a/Projects/vc22/Apache.vcxproj
+++ b/Projects/vc22/Apache.vcxproj
@@ -31,16 +31,9 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
- </ItemGroup>
+ </ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\apache\mod_shib_24.rc">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
+ <ResourceCompile Include="..\..\apache\mod_shib_24.rc" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion>
@@ -153,6 +146,9 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -174,6 +170,9 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -191,6 +190,9 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
@@ -208,6 +210,9 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@@ -229,6 +234,9 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
@@ -250,8 +258,11 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc22/iis.vcxproj b/Projects/vc22/iis.vcxproj
index 51bfb61e..9143329f 100644
--- a/Projects/vc22/iis.vcxproj
+++ b/Projects/vc22/iis.vcxproj
@@ -111,6 +111,9 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -129,6 +132,9 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -143,6 +149,9 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@@ -161,6 +170,9 @@
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <ResourceCompile>
+ <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list