X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml.vcproj;h=fb923537e58e509d033d6c79ccf763f19abd6ac9;hb=e249895290e9d808e9fc2ac2f0bcbdfd664547ee;hp=76dd93f96d671c6f91fb8ac5b71d3b1e7460906c;hpb=a0f7ddfb1954304a01b6a49580ce8d2603a60446;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 76dd93f..fb92353 100644
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="saml"
 	ProjectGUID="{34DE3EA5-EA05-4261-8B63-A850FFB91768}"
 	RootNamespace="saml"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -20,7 +24,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -55,17 +59,20 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"
-				OutputFile="$(OutDir)\$(ProjectName)2_0D.dll"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib zlib1d.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_4D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(TargetDir)$(ProjectName)2D.lib"
 				TargetMachine="1"
 			/>
@@ -88,7 +95,84 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BrowseInformation="1"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib zlib1d.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_4D.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)2D.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -99,7 +183,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -137,13 +221,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"
-				OutputFile="$(OutDir)\$(ProjectName)2_0.dll"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib zlib1.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_4.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(TargetDir)$(ProjectName)2.lib"
 				TargetMachine="1"
 			/>
@@ -166,7 +252,82 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib zlib1.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_4.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)2.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -239,7 +400,7 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml1\binding\impl\SAML1MessageRule.cpp"
+							RelativePath=".\saml1\binding\impl\SAML1MessageDecoder.cpp"
 							>
 						</File>
 						<File
@@ -275,14 +436,22 @@
 				<Filter
 					Name="profile"
 					>
-					<File
-						RelativePath=".\saml1\profile\AssertionValidator.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\saml1\profile\BrowserSSOProfileValidator.cpp"
+					<Filter
+						Name="impl"
 						>
-					</File>
+						<File
+							RelativePath=".\saml1\profile\impl\AssertionValidator.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\profile\impl\BrowserSSOProfileValidator.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\profile\impl\SAML1BrowserSSORule.cpp"
+							>
+						</File>
+					</Filter>
 				</Filter>
 			</Filter>
 			<Filter
@@ -351,6 +520,18 @@
 							>
 						</File>
 						<File
+							RelativePath=".\saml2\metadata\impl\EntityRoleMetadataFilter.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\metadata\impl\MetadataCredentialContext.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\metadata\impl\MetadataCredentialCriteria.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\metadata\impl\MetadataImpl.cpp"
 							>
 						</File>
@@ -363,6 +544,18 @@
 							>
 						</File>
 						<File
+							RelativePath=".\saml2\metadata\impl\NullMetadataProvider.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\metadata\impl\ObservableMetadataProvider.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\metadata\impl\RequireValidUntilMetadataFilter.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\metadata\impl\SignatureMetadataFilter.cpp"
 							>
 						</File>
@@ -395,6 +588,15 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
+								Name="Debug|x64"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
 								Name="Release|Win32"
 								>
 								<Tool
@@ -403,6 +605,15 @@
 									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 								/>
 							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|x64"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
 						</File>
 						<File
 							RelativePath=".\saml2\binding\impl\SAML2ArtifactDecoder.cpp"
@@ -425,6 +636,15 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
+								Name="Debug|x64"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
 								Name="Release|Win32"
 								>
 								<Tool
@@ -433,9 +653,26 @@
 									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
 								/>
 							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|x64"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2ECPDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2ECPEncoder.cpp"
+							>
 						</File>
 						<File
-							RelativePath=".\saml2\binding\impl\SAML2MessageRule.cpp"
+							RelativePath=".\saml2\binding\impl\SAML2MessageDecoder.cpp"
 							>
 						</File>
 						<File
@@ -475,50 +712,30 @@
 				<Filter
 					Name="profile"
 					>
-					<File
-						RelativePath=".\saml2\profile\Assertion20Validator.cpp"
+					<Filter
+						Name="impl"
 						>
-						<FileConfiguration
-							Name="Debug|Win32"
+						<File
+							RelativePath=".\saml2\profile\impl\Assertion20Validator.cpp"
 							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
+						</File>
+						<File
+							RelativePath=".\saml2\profile\impl\BearerConfirmationRule.cpp"
 							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath=".\saml2\profile\BrowserSSOProfile20Validator.cpp"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
+						</File>
+						<File
+							RelativePath=".\saml2\profile\impl\BrowserSSOProfile20Validator.cpp"
 							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
+						</File>
+						<File
+							RelativePath=".\saml2\profile\impl\DelegationRestrictionRule.cpp"
 							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\$(InputName)1.obj"
-								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-							/>
-						</FileConfiguration>
-					</File>
+						</File>
+						<File
+							RelativePath=".\saml2\profile\impl\SAML2AssertionPolicy.cpp"
+							>
+						</File>
+					</Filter>
 				</Filter>
 			</Filter>
 			<Filter
@@ -582,44 +799,24 @@
 				</Filter>
 			</Filter>
 			<Filter
-				Name="zlib"
+				Name="profile"
 				>
-				<File
-					RelativePath=".\zlib\adler32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\compress.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\crc32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\deflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inffast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inftrees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\trees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\zutil.c"
+				<Filter
+					Name="impl"
 					>
-				</File>
+					<File
+						RelativePath=".\profile\impl\AudienceRestrictionRule.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\profile\impl\ConditionsRule.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\profile\impl\IgnoreRule.cpp"
+						>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
@@ -686,6 +883,10 @@
 					Name="binding"
 					>
 					<File
+						RelativePath=".\saml1\binding\SAML1MessageDecoder.h"
+						>
+					</File>
+					<File
 						RelativePath=".\saml1\binding\SAML1SOAPClient.h"
 						>
 					</File>
@@ -750,10 +951,6 @@
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\metadata\ChainingMetadataProvider.h"
-						>
-					</File>
-					<File
 						RelativePath=".\saml2\metadata\DynamicMetadataProvider.h"
 						>
 					</File>
@@ -798,6 +995,10 @@
 						>
 					</File>
 					<File
+						RelativePath=".\saml2\binding\SAML2MessageDecoder.h"
+						>
+					</File>
+					<File
 						RelativePath=".\saml2\binding\SAML2Redirect.h"
 						>
 					</File>
@@ -817,6 +1018,10 @@
 						RelativePath=".\saml2\profile\BrowserSSOProfileValidator.h"
 						>
 					</File>
+					<File
+						RelativePath=".\saml2\profile\SAML2AssertionPolicy.h"
+						>
+					</File>
 				</Filter>
 			</Filter>
 			<Filter
@@ -859,57 +1064,21 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="zlib"
-				>
-				<File
-					RelativePath=".\zlib\crc32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\deflate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inffast.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inffixed.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inflate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inftrees.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\trees.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\zconf.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\zlib.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\zutil.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath=".\saml.rc"
+				>
+			</File>
 		</Filter>
+		<File
+			RelativePath=".\Makefile.am"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>