X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Fxmltooling.vcproj;h=8f7e141ceda584bbfce0d6a45cc7c618cb5c627a;hb=d607c7e778c2c9cadf3a3605c6f66a400a2c223c;hp=3efe188c7b1e61bfa713434e22c8f1a2228bf8eb;hpb=b17993e4880f536ac5a255df564e322d7af8a69c;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/xmltooling.vcproj b/xmltooling/xmltooling.vcproj
index 3efe188..8f7e141 100644
--- a/xmltooling/xmltooling.vcproj
+++ b/xmltooling/xmltooling.vcproj
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="xmltooling"
 	ProjectGUID="{06B55A46-D3B3-41AE-B5A5-B57830BA010D}"
 	RootNamespace="xmltooling"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -45,7 +49,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
 				BrowseInformation="1"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -56,17 +60,20 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4cppD.lib xerces-c_2D.lib xsec_1D.lib libeay32_0_9_8D.lib ssleay32_0_9_8D.lib libcurld_imp.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"
+				AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_3D.lib xsec_1D.lib libeay32D.lib ssleay32D.lib libcurld_imp.lib"
+				OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(TargetDir)$(ProjectName)1D.lib"
 				TargetMachine="1"
 			/>
@@ -89,7 +96,85 @@
 				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;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderThrough=""
+				BrowseInformation="1"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wsock32.lib log4shib1D.lib xerces-c_3D.lib xsec_1D.lib libeay32D.lib ssleay32D.lib libcurld_imp.lib"
+				OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)1D.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -123,7 +208,7 @@
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
 				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
@@ -139,13 +224,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4cpp.lib xerces-c_2.lib xsec_1.lib libeay32_0_9_8.lib ssleay32_0_9_8.lib libcurl_imp.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_0.dll"
-				LinkIncremental="2"
+				AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_3.lib xsec_1.lib libeay32.lib ssleay32.lib libcurl_imp.lib"
+				OutputFile="$(OutDir)\$(ProjectName)1_3.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(TargetDir)$(ProjectName)1.lib"
 				TargetMachine="1"
 			/>
@@ -168,7 +254,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;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				RuntimeLibrary="2"
+				PrecompiledHeaderThrough=""
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="wsock32.lib log4shib1.lib xerces-c_3.lib xsec_1.lib libeay32.lib ssleay32.lib libcurl_imp.lib"
+				OutputFile="$(OutDir)\$(ProjectName)1_3.dll"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)1.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -231,6 +392,10 @@
 				Name="util"
 				>
 				<File
+					RelativePath=".\util\CurlURLInputStream.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\util\DateTime.cpp"
 					>
 				</File>
@@ -243,6 +408,14 @@
 					>
 				</File>
 				<File
+					RelativePath=".\util\PathResolver.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\util\ReloadableXMLFile.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\util\ReplayCache.cpp"
 					>
 				</File>
@@ -255,6 +428,10 @@
 					>
 				</File>
 				<File
+					RelativePath=".\util\URLEncoder.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\util\Win32Threads.cpp"
 					>
 				</File>
@@ -278,6 +455,10 @@
 					RelativePath=".\io\AbstractXMLObjectUnmarshaller.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\io\HTTPRequest.cpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="impl"
@@ -310,18 +491,6 @@
 					Name="impl"
 					>
 					<File
-						RelativePath=".\signature\impl\CredentialResolver.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\signature\impl\FilesystemCredentialResolver.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\signature\impl\InlineKeyResolver.cpp"
-						>
-					</File>
-					<File
 						RelativePath=".\signature\impl\KeyInfoImpl.cpp"
 						>
 					</File>
@@ -330,10 +499,6 @@
 						>
 					</File>
 					<File
-						RelativePath=".\signature\impl\KeyResolver.cpp"
-						>
-					</File>
-					<File
 						RelativePath=".\signature\impl\SignatureValidator.cpp"
 						>
 					</File>
@@ -354,6 +519,10 @@
 						>
 					</File>
 					<File
+						RelativePath=".\encryption\impl\EncryptedKeyResolver.cpp"
+						>
+					</File>
+					<File
 						RelativePath=".\encryption\impl\Encrypter.cpp"
 						>
 					</File>
@@ -378,18 +547,54 @@
 						>
 					</File>
 					<File
+						RelativePath=".\security\impl\BasicX509Credential.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\security\impl\ChainingCredentialResolver.cpp"
+						>
+					</File>
+					<File
 						RelativePath=".\security\impl\ChainingTrustEngine.cpp"
 						>
 					</File>
 					<File
+						RelativePath=".\security\impl\CredentialCriteria.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\security\impl\CredentialResolver.cpp"
+						>
+					</File>
+					<File
 						RelativePath=".\security\impl\ExplicitKeyTrustEngine.cpp"
 						>
 					</File>
 					<File
+						RelativePath=".\security\impl\FilesystemCredentialResolver.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\security\impl\InlineKeyResolver.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\security\impl\KeyInfoResolver.cpp"
+						>
+					</File>
+					<File
 						RelativePath=".\security\impl\OpenSSLCryptoX509CRL.cpp"
 						>
 					</File>
 					<File
+						RelativePath=".\security\impl\SecurityHelper.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\security\impl\StaticPKIXTrustEngine.cpp"
+						>
+					</File>
+					<File
 						RelativePath=".\security\impl\TrustEngine.cpp"
 						>
 					</File>
@@ -442,10 +647,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\AbstractElementProxy.h"
-				>
-			</File>
-			<File
 				RelativePath=".\AbstractSimpleElement.h"
 				>
 			</File>
@@ -462,10 +663,18 @@
 				>
 			</File>
 			<File
+				RelativePath=".\ConcreteXMLObjectBuilder.h"
+				>
+			</File>
+			<File
 				RelativePath=".\config_pub_win32.h"
 				>
 			</File>
 			<File
+				RelativePath=".\ElementExtensibleXMLObject.h"
+				>
+			</File>
+			<File
 				RelativePath=".\ElementProxy.h"
 				>
 			</File>
@@ -482,7 +691,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\MixedElement.h"
+				RelativePath=".\logging.h"
 				>
 			</File>
 			<File
@@ -498,10 +707,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\SimpleElement.h"
-				>
-			</File>
-			<File
 				RelativePath=".\unicode.h"
 				>
 			</File>
@@ -525,6 +730,10 @@
 				Name="util"
 				>
 				<File
+					RelativePath=".\util\CurlURLInputStream.h"
+					>
+				</File>
+				<File
 					RelativePath=".\util\DateTime.h"
 					>
 				</File>
@@ -537,6 +746,18 @@
 					>
 				</File>
 				<File
+					RelativePath=".\util\PathResolver.h"
+					>
+				</File>
+				<File
+					RelativePath=".\util\Predicates.h"
+					>
+				</File>
+				<File
+					RelativePath=".\util\ReloadableXMLFile.h"
+					>
+				</File>
+				<File
 					RelativePath=".\util\ReplayCache.h"
 					>
 				</File>
@@ -553,6 +774,10 @@
 					>
 				</File>
 				<File
+					RelativePath=".\util\URLEncoder.h"
+					>
+				</File>
+				<File
 					RelativePath=".\util\XMLConstants.h"
 					>
 				</File>
@@ -576,6 +801,22 @@
 					RelativePath=".\io\AbstractXMLObjectUnmarshaller.h"
 					>
 				</File>
+				<File
+					RelativePath=".\io\GenericRequest.h"
+					>
+				</File>
+				<File
+					RelativePath=".\io\GenericResponse.h"
+					>
+				</File>
+				<File
+					RelativePath=".\io\HTTPRequest.h"
+					>
+				</File>
+				<File
+					RelativePath=".\io\HTTPResponse.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="impl"
@@ -605,30 +846,14 @@
 				Name="signature"
 				>
 				<File
-					RelativePath=".\signature\CachingKeyResolver.h"
-					>
-				</File>
-				<File
 					RelativePath=".\signature\ContentReference.h"
 					>
 				</File>
 				<File
-					RelativePath=".\signature\CredentialResolver.h"
-					>
-				</File>
-				<File
 					RelativePath=".\signature\KeyInfo.h"
 					>
 				</File>
 				<File
-					RelativePath=".\signature\KeyResolver.h"
-					>
-				</File>
-				<File
-					RelativePath=".\signature\OpenSSLCredentialResolver.h"
-					>
-				</File>
-				<File
 					RelativePath=".\signature\Signature.h"
 					>
 				</File>
@@ -665,11 +890,39 @@
 					>
 				</File>
 				<File
+					RelativePath=".\security\BasicX509Credential.h"
+					>
+				</File>
+				<File
 					RelativePath=".\security\ChainingTrustEngine.h"
 					>
 				</File>
 				<File
-					RelativePath=".\security\KeyInfoSource.h"
+					RelativePath=".\security\Credential.h"
+					>
+				</File>
+				<File
+					RelativePath=".\security\CredentialContext.h"
+					>
+				</File>
+				<File
+					RelativePath=".\security\CredentialCriteria.h"
+					>
+				</File>
+				<File
+					RelativePath=".\security\CredentialResolver.h"
+					>
+				</File>
+				<File
+					RelativePath=".\security\KeyInfoCredentialContext.h"
+					>
+				</File>
+				<File
+					RelativePath=".\security\KeyInfoResolver.h"
+					>
+				</File>
+				<File
+					RelativePath=".\security\OpenSSLCredential.h"
 					>
 				</File>
 				<File
@@ -681,10 +934,22 @@
 					>
 				</File>
 				<File
+					RelativePath=".\security\SecurityHelper.h"
+					>
+				</File>
+				<File
+					RelativePath=".\security\SignatureTrustEngine.h"
+					>
+				</File>
+				<File
 					RelativePath=".\security\TrustEngine.h"
 					>
 				</File>
 				<File
+					RelativePath=".\security\X509Credential.h"
+					>
+				</File>
+				<File
 					RelativePath=".\security\X509TrustEngine.h"
 					>
 				</File>
@@ -723,6 +988,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=".\xmltooling.rc"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>