Add zlib DLL to build.

[shibboleth/cpp-opensaml.git] / saml / saml.vcproj

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index f943fb5..fb92353 100644 (file)
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -24,7 +24,7 @@
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -66,8 +66,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_3D.dll"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib zlib1d.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_4D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -103,7 +103,7 @@
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -146,8 +146,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_3D.dll"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib zlib1d.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_4D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -183,7 +183,7 @@
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -221,8 +221,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_3.dll"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib zlib1.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_4.dll"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -260,7 +260,7 @@
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -299,8 +299,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_3.dll"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib zlib1.lib"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_4.dll"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -524,6 +524,10 @@
                                                        >\r
                                                </File>\r
                                                <File\r
+                                                       RelativePath=".\saml2\metadata\impl\MetadataCredentialContext.cpp"\r
+                                                       >\r
+                                               </File>\r
+                                               <File\r
                                                        RelativePath=".\saml2\metadata\impl\MetadataCredentialCriteria.cpp"\r
                                                        >\r
                                                </File>\r
@@ -544,6 +548,10 @@
                                                        >\r
                                                </File>\r
                                                <File\r
+                                                       RelativePath=".\saml2\metadata\impl\ObservableMetadataProvider.cpp"\r
+                                                       >\r
+                                               </File>\r
+                                               <File\r
                                                        RelativePath=".\saml2\metadata\impl\RequireValidUntilMetadataFilter.cpp"\r
                                                        >\r
                                                </File>\r
@@ -791,46 +799,6 @@
                                </Filter>\r
                        </Filter>\r
                        <Filter\r
-                               Name="zlib"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\zlib\adler32.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\compress.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\crc32.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\deflate.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\inffast.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\inflate.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\inftrees.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\trees.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\zutil.c"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
                                Name="profile"\r
                                >\r
                                <Filter\r
@@ -1096,50 +1064,6 @@
                                        >\r
                                </File>\r
                        </Filter>\r
-                       <Filter\r
-                               Name="zlib"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\zlib\crc32.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\deflate.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\inffast.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\inffixed.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\inflate.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\inftrees.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\trees.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\zconf.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\zlib.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\zlib\zutil.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
@@ -1151,6 +1075,10 @@
                                >\r
                        </File>\r
                </Filter>\r
+               <File\r
+                       RelativePath=".\Makefile.am"\r
+                       >\r
+               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r