Port up context changes to prevent false spoofing error.

[shibboleth/sp.git] / apache / mod_shib13.vcproj

diff --git a/apache/mod_shib13.vcproj b/apache/mod_shib13.vcproj
index 15b13c3..c259b88 100644 (file)
--- a/apache/mod_shib13.vcproj
+++ b/apache/mod_shib13.vcproj
@@ -15,8 +15,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory=".\Release"
-                       IntermediateDirectory=".\Release"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="0"
@@ -48,17 +48,11 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..,..\..\..\opensaml\c,\Apache\include"
+                               AdditionalIncludeDirectories="..;\Apache\include;&quot;..\..\cpp-xmltooling&quot;"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EAPI"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
-                               RuntimeTypeInfo="true"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\Release/mod_shib13.pch"
-                               AssemblerListingLocation=".\Release/"
-                               ObjectFile=".\Release/"
-                               ProgramDataBaseFileName=".\Release/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                Detect64BitPortabilityProblems="true"
@@ -77,11 +71,11 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="log4cpp.lib xerces-c_2.lib ApacheCore.lib saml_5.lib"
-                               OutputFile="Release/mod_shib_13.so"
+                               AdditionalDependencies="xerces-c_2.lib ApacheCore.lib xmltooling-lite1.lib"
+                               OutputFile="$(OutDir)\mod_shib_13.so"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="../../../opensaml/c/saml/Release,\Apache\libexec"
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\$(ConfigurationName)&quot;;\Apache\libexec"
                                ProgramDatabaseFile=".\Release/mod_shib_13.pdb"
                                ImportLibrary=".\Release/mod_shib_13.lib"
                                TargetMachine="1"
@@ -113,8 +107,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory=".\Debug"
-                       IntermediateDirectory=".\Debug"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="0"
@@ -145,16 +139,10 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;;\Apache\include"
+                               AdditionalIncludeDirectories="..;\Apache\include;&quot;..\..\cpp-xmltooling&quot;"
                                PreprocessorDefinitions="_WINDOWS;EAPI;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
-                               RuntimeTypeInfo="true"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\Debug/mod_shib13.pch"
-                               AssemblerListingLocation=".\Debug/"
-                               ObjectFile=".\Debug/"
-                               ProgramDataBaseFileName=".\Debug/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
@@ -175,11 +163,11 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="log4cppD.lib xerces-c_2D.lib ApacheCore.lib saml_5D.lib"
-                               OutputFile="Debug/mod_shib_13.so"
+                               AdditionalDependencies="xerces-c_2D.lib ApacheCore.lib xmltooling-lite1D.lib"
+                               OutputFile="$(OutDir)\mod_shib_13.so"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="../../../opensaml/c/saml/Debug,\Apache\libexec"
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\$(ConfigurationName)&quot;;\Apache\libexec"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/mod_shib_13.lib"
                                TargetMachine="1"
@@ -236,28 +224,6 @@
                <File
                        RelativePath="mod_shib_13.cpp"
                        >
-                       <FileConfiguration
-                               Name="Release|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="2"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;EAPI;$(NoInherit)"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="0"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="_WINDOWS;EAPI;WIN32;_DEBUG;_MBCS;$(NoInherit)"
-                                       BasicRuntimeChecks="3"
-                                       BrowseInformation="1"
-                               />
-                       </FileConfiguration>
                </File>
                <File
                        RelativePath="mod_shib_13.rc"