Move Shib constants to new lib, fixed symbol conflicts.

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

diff --git a/apache/mod_shib20.vcproj b/apache/mod_shib20.vcproj
index faad9dc..14d9d6d 100644 (file)
--- a/apache/mod_shib20.vcproj
+++ b/apache/mod_shib20.vcproj
@@ -48,7 +48,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..,..\..\..\opensaml\c,\Apache2\include"
+                               AdditionalIncludeDirectories="..;"..\..\cpp-opensaml1";\Apache2\include;"..\..\cpp-opensaml2";"..\..\cpp-xmltooling""
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -77,11 +77,11 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="log4cpp.lib xerces-c_2.lib libapr.lib libhttpd.lib saml_5.lib"
+                               AdditionalDependencies="log4cpp.lib xerces-c_2.lib libapr.lib libhttpd.lib saml_5.lib saml2.lib xmltooling1.lib"
                                OutputFile="mod_shib20___Win32_Release/mod_shib_20.so"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="../../../opensaml/c/saml/Release,\httpd-2.0.52\srclib\apr\Release,\httpd-2.0.52\Release"
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-opensaml1\saml\Release&quot;;&quot;..\..\cpp-opensaml2\Release&quot;;&quot;..\..\cpp-xmltooling\Release&quot;,\httpd-2.0.52\srclib\apr\Release,\httpd-2.0.52\Release"
                                ProgramDatabaseFile=".\mod_shib20___Win32_Release/mod_shib_20.pdb"
                                ImportLibrary=".\mod_shib20___Win32_Release/mod_shib_20.lib"
                                TargetMachine="1"
@@ -145,7 +145,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;;\Apache2\include"
+                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;;\Apache2\include;&quot;..\..\cpp-opensaml2&quot;;&quot;..\..\cpp-xmltooling&quot;"
                                PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -175,11 +175,11 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="log4cppD.lib xerces-c_2D.lib libapr.lib libhttpd.lib saml_5D.lib"
+                               AdditionalDependencies="log4cppD.lib xerces-c_2D.lib libapr.lib libhttpd.lib saml_5D.lib saml2D.lib xmltooling1D.lib"
                                OutputFile="mod_shib20___Win32_Debug/mod_shib_20.so"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="../../../opensaml/c/saml/Debug,\httpd-2.0.52\srclib\apr\Debug,\httpd-2.0.52\Debug"
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-opensaml1\saml\Debug&quot;;&quot;..\..\cpp-opensaml2\Debug&quot;;&quot;..\..\cpp-xmltooling\Debug&quot;;\httpd-2.0.52\srclib\apr\Debug,\httpd-2.0.52\Debug"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\mod_shib20___Win32_Debug/mod_shib_20.lib"
                                TargetMachine="1"
@@ -216,28 +216,6 @@
                <File
                        RelativePath="mod_shib_20.cpp"
                        >
-                       <FileConfiguration
-                               Name="Release|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="2"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;$(NoInherit)"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="0"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG;_MBCS;$(NoInherit)"
-                                       BasicRuntimeChecks="3"
-                                       BrowseInformation="1"
-                               />
-                       </FileConfiguration>
                </File>
                <File
                        RelativePath="mod_shib_20.rc"