</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ClCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>\r
</ClCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
<ItemGroup Label="ProjectConfigurations">\r
<ProjectConfiguration Include="Debug|Win32">\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;ApacheCore.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;ApacheCore.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;ApacheCore.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;ApacheCore.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
</ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
<ItemGroup Label="ProjectConfigurations">\r
<ProjectConfiguration Include="Debug|Win32">\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
</ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
<ItemGroup Label="ProjectConfigurations">\r
<ProjectConfiguration Include="Debug|Win32">\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
</ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
<ItemGroup Label="ProjectConfigurations">\r
<ProjectConfiguration Include="Debug|Win32">\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
</ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
<Link>\r
<AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<RandomizedBaseAddress>false</RandomizedBaseAddress>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<Link>\r
<AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<RandomizedBaseAddress>false</RandomizedBaseAddress>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<Link>\r
<AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<RandomizedBaseAddress>false</RandomizedBaseAddress>\r
<DataExecutionPrevention>\r
<Link>\r
<AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<RandomizedBaseAddress>false</RandomizedBaseAddress>\r
<DataExecutionPrevention>\r
<None Include="Installer.make" />\r
<None Include="license.rtf" />\r
<None Include="ShibbolethSP-defs-x86.wxi" />\r
- <None Include="ShibbolethSP-exe-x64.wxs" />\r
+ <None Include="ShibbolethSP-exe-x64.wxs">\r
+ <SubType>Designer</SubType>\r
+ </None>\r
<None Include="ShibbolethSP-exe-x86.wxs" />\r
<None Include="ShibbolethSP-gui.wxs" />\r
<None Include="ShibbolethSP-install-dlg.wxs" />\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
</ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file
light OpenSAML-x64.wixobj
del ..\*64*.msi
-OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Release\xmltooling$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Release\xmltooling-lite$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-OpenSaml\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Debug\xmltooling$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-xmltooling\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-OpenSaml\Debug\saml$(OpenSAMLFileVersion)d.dll
+OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling-lite$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-OpenSaml\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debug\xmltooling$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-OpenSaml\Debug\saml$(OpenSAMLFileVersion)d.dll
wixcop -indent:2 OpenSAML-x86.wxs
- candle OpenSAML-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent32=$(SamlComponent32) -dXMLToolingComponent32=$(XMLToolingComponent32) -dXMLToolingLiteComponent32=$(XMLToolingLiteComponent32) -dSamlComponent32d=$(SamlComponent32d) -dXMLToolingComponent32d=$(XMLToolingComponent32d) -dXMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d)
+ candle OpenSAML-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent32=$(SamlComponent32) -dXMLToolingComponent32=$(XMLToolingComponent32) -dXMLToolingLiteComponent32=$(XMLToolingLiteComponent32) -dSamlComponent32d=$(SamlComponent32d) -dXMLToolingComponent32d=$(XMLToolingComponent32d) -dXMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) -dShibbolethMsVersion=vc10
-OpenSAML-x64.wixobj: OpenSAML-x64.wxs $(SolutionDir)..\cpp-xmltooling\x64\Release\xmltooling$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-xmltooling\x64\Release\xmltooling-lite$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-OpenSaml\x64\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\x64\Debug\xmltooling$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-xmltooling\x64\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-OpenSaml\x64\Debug\saml$(OpenSAMLFileVersion)d.dll
+OpenSAML-x64.wixobj: OpenSAML-x64.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling-lite$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-OpenSaml\x64\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Debug\xmltooling$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-OpenSaml\x64\Debug\saml$(OpenSAMLFileVersion)d.dll
wixcop -indent:2 OpenSAML-x64.wxs
- candle OpenSAML-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent64=$(SamlComponent64) -dXMLToolingComponent64=$(XMLToolingComponent64) -dXMLToolingLiteComponent64=$(XMLToolingLiteComponent64) -dSamlComponent64d=$(SamlComponent64d) -dXMLToolingComponent64d=$(XMLToolingComponent64d) -dXMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d)
+ candle OpenSAML-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent64=$(SamlComponent64) -dXMLToolingComponent64=$(XMLToolingComponent64) -dXMLToolingLiteComponent64=$(XMLToolingLiteComponent64) -dSamlComponent64d=$(SamlComponent64d) -dXMLToolingComponent64d=$(XMLToolingComponent64d) -dXMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) -dShibbolethMsVersion=vc10
OpenSAML-schemas.msm: OpenSAML-schemas.wixobj
light OpenSAML-schemas.wixobj
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
- <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) all32</NMakeBuildCommandLine>\r
+ <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) MsVCVersion=vc10 all32</NMakeBuildCommandLine>\r
<NMakeCleanCommandLine>del *86.wixobj\r
del *86.msm\r
del *x86.wixpdb\r
del OpenSAML-schemas.wixpdb\r
del OpenSAML-schemas.wixobj\r
del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
- <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) rebuild32</NMakeReBuildCommandLine>\r
+ <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) MsVCVersion=vc10 rebuild32</NMakeReBuildCommandLine>\r
<NMakePreprocessorDefinitions>\r
</NMakePreprocessorDefinitions>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
- <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) all64</NMakeBuildCommandLine>\r
+ <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) MsVCVersion=vc10 all64</NMakeBuildCommandLine>\r
<NMakeCleanCommandLine>del *64.wixobj\r
del *64.msm \r
del *64.wixpdb \r
del OpenSAML-schemas.wixpdb \r
del OpenSAML-schemas.wixobj\r
del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
- <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) rebuild64</NMakeReBuildCommandLine>\r
+ <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) MsVCVersion=vc10 rebuild64</NMakeReBuildCommandLine>\r
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
</PropertyGroup>\r
<ItemDefinitionGroup>\r
</ItemDefinitionGroup>\r
<ItemGroup>\r
- <None Include="Curl-x64.wxs" />\r
+ <None Include="Curl-x64.wxs">\r
+ <SubType>Designer</SubType>\r
+ </None>\r
<None Include="Curl-x86.wxs" />\r
<None Include="FastCGI-x86.wxs" />\r
<None Include="FastCGI-x64.wxs" />\r
<None Include="Log4Shib-x64.wxs" />\r
<None Include="Log4Shib-x86.wxs" />\r
<None Include="OpenSAML-schemas.wxs" />\r
- <None Include="OpenSAML-x64.wxs" />\r
+ <None Include="OpenSAML-x64.wxs">\r
+ <SubType>Designer</SubType>\r
+ </None>\r
<None Include="OpenSAML-x86.wxs" />\r
<None Include="OpenSSL-x64.wxs" />\r
<None Include="OpenSSL-x86.wxs" />\r
<File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />
</Component>
<Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent64)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
</Component>
<Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent64)' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
</Component>
<Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Debug\'>
<Component Id='samlD.dll' Guid='$(var.SamlComponent64d)' Win64='yes'>
</Component>
<Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent64d)' Win64='yes'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+ Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
</Component>
<Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent64d)' Win64='yes'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+ Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
</Component>
</Directory><!-- lib_debug -->
</Directory><!-- lib -->
<File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />
</Component>
<Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent32)'>
- <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
</Component>
<Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent32)'>
- <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
</Component>
<Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Debug\'>
<Component Id='samlD.dll' Guid='$(var.SamlComponent32d)'>
</Component>
<Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent32d)'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+ Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
</Component>
<Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent32d)'>
<File KeyPath='yes' Checksum='yes'
- Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+ Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
</Component>
</Directory><!-- lib_debug -->
</Directory><!-- lib -->
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ClCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>\r
</ClCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<Link>\r
<SubSystem>Windows</SubSystem>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>\r
<OptimizeReferences>true</OptimizeReferences>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
</ClCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<Link>\r
<SubSystem>Windows</SubSystem>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>\r
<OptimizeReferences>true</OptimizeReferences>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
</Link>\r
</ItemDefinitionGroup>\r
</ClCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>wsock32.lib;log4shib1.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>wsock32.lib;log4shib1.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>wsock32.lib;log4shib1D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>wsock32.lib;log4shib1D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<DataExecutionPrevention>\r
</ClCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>\r
</ClCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Windows</SubSystem>\r
<OptimizeReferences>true</OptimizeReferences>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r
</ResourceCompile>\r
<Link>\r
<AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
- <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <AdditionalLibraryDirectories>..\..\cpp-opensaml\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
<GenerateDebugInformation>true</GenerateDebugInformation>\r
<SubSystem>Console</SubSystem>\r
<DataExecutionPrevention>\r