X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml.vcproj;h=efb495c09b7f41b548921bb09a3297e182c2e104;hb=4934d258a5aaca1d53a69e07941a0e77176c7880;hp=f601468a4e54f61a183fc8a8f0a7fc80fd136d00;hpb=1358ecc315370a4dc0c02b941195919ca2bbd4c3;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index f601468..efb495c 100644
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -55,13 +55,14 @@
 			/>
 			<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 log4cppD.lib libeay32_0_9_8D.lib"
+				AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"
 				OutputFile="$(OutDir)\$(ProjectName)2_0D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -119,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -137,7 +138,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4cpp.lib libeay32_0_9_8.lib"
+				AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"
 				OutputFile="$(OutDir)\$(ProjectName)2_0.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -189,10 +190,6 @@
 				Name="util"
 				>
 				<File
-					RelativePath=".\util\CGIParser.cpp"
-					>
-				</File>
-				<File
 					RelativePath=".\util\CommonDomainCookie.cpp"
 					>
 				</File>
@@ -243,7 +240,7 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml1\binding\impl\SAML1MessageRule.cpp"
+							RelativePath=".\saml1\binding\impl\SAML1MessageDecoder.cpp"
 							>
 						</File>
 						<File
@@ -311,6 +308,10 @@
 						Name="impl"
 						>
 						<File
+							RelativePath=".\saml2\core\impl\Assertions.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\core\impl\Assertions20Impl.cpp"
 							>
 						</File>
@@ -347,19 +348,19 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\MetadataImpl.cpp"
+							RelativePath=".\saml2\metadata\impl\DynamicMetadataProvider.cpp"
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\MetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\MetadataImpl.cpp"
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\MetadataSchemaValidators.cpp"
+							RelativePath=".\saml2\metadata\impl\MetadataProvider.cpp"
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\ObservableMetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\MetadataSchemaValidators.cpp"
 							>
 						</File>
 						<File
@@ -435,7 +436,15 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\saml2\binding\impl\SAML2MessageRule.cpp"
+							RelativePath=".\saml2\binding\impl\SAML2ECPDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2ECPEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2MessageDecoder.cpp"
 							>
 						</File>
 						<File
@@ -476,7 +485,7 @@
 					Name="profile"
 					>
 					<File
-						RelativePath=".\saml2\profile\AssertionValidator.cpp"
+						RelativePath=".\saml2\profile\Assertion20Validator.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -498,7 +507,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath=".\saml2\profile\BrowserSSOProfileValidator.cpp"
+						RelativePath=".\saml2\profile\BrowserSSOProfile20Validator.cpp"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -659,10 +668,6 @@
 				Name="util"
 				>
 				<File
-					RelativePath=".\util\CGIParser.h"
-					>
-				</File>
-				<File
 					RelativePath=".\util\CommonDomainCookie.h"
 					>
 				</File>
@@ -690,6 +695,10 @@
 					Name="binding"
 					>
 					<File
+						RelativePath=".\saml1\binding\SAML1MessageDecoder.h"
+						>
+					</File>
+					<File
 						RelativePath=".\saml1\binding\SAML1SOAPClient.h"
 						>
 					</File>
@@ -758,6 +767,10 @@
 						>
 					</File>
 					<File
+						RelativePath=".\saml2\metadata\DynamicMetadataProvider.h"
+						>
+					</File>
+					<File
 						RelativePath=".\saml2\metadata\EndpointManager.h"
 						>
 					</File>
@@ -766,11 +779,15 @@
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\metadata\MetadataFilter.h"
+						RelativePath=".\saml2\metadata\MetadataCredentialContext.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\metadata\MetadataKeyInfoIterator.h"
+						RelativePath=".\saml2\metadata\MetadataCredentialCriteria.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\metadata\MetadataFilter.h"
 						>
 					</File>
 					<File
@@ -794,6 +811,10 @@
 						>
 					</File>
 					<File
+						RelativePath=".\saml2\binding\SAML2MessageDecoder.h"
+						>
+					</File>
+					<File
 						RelativePath=".\saml2\binding\SAML2Redirect.h"
 						>
 					</File>
@@ -831,22 +852,6 @@
 					>
 				</File>
 				<File
-					RelativePath=".\binding\GenericRequest.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\GenericResponse.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\HTTPRequest.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\HTTPResponse.h"
-					>
-				</File>
-				<File
 					RelativePath=".\binding\MessageDecoder.h"
 					>
 				</File>
@@ -921,6 +926,10 @@
 			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>
 	</Files>
 	<Globals>