[libsoup] MSVC builds: Add config for MIT GSSAPI support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] MSVC builds: Add config for MIT GSSAPI support
- Date: Fri, 15 Apr 2016 07:34:18 +0000 (UTC)
commit b318b79130779e6d8cf4abf959ca4887adaac9a0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Apr 15 15:29:30 2016 +0800
MSVC builds: Add config for MIT GSSAPI support
This adds support in the Visual Studio projects so that one can build
libSOUP with MIT GSSAPI support, given that MIT Kerberos is installed
beforehand, by using the configs with _MIT_GSSAPI in them. The orginal
configs are still available and will still be the default Release and
Debug configs.
Also update config.h.win32.in so that it will be more consistent with the
entries checked for in the autotools-generated config.h.in, but the
LIBSOUP_HAVE_GSSAPI is activated only via the aforementioned project
configs.
build/win32/vs10/libsoup.sln | 52 ++++++
build/win32/vs10/soup-dll-build-defines.props | 4 +
build/win32/vs10/soup.vcxprojin | 204 +++++++++++++++++++++--
build/win32/vs9/libsoup.sln | 52 ++++++
build/win32/vs9/soup-dll-build-defines.vsprops | 16 ++
build/win32/vs9/soup.vcprojin | 134 ++++++++++++++++
config.h.win32.in | 4 +
7 files changed, 448 insertions(+), 18 deletions(-)
---
diff --git a/build/win32/vs10/libsoup.sln b/build/win32/vs10/libsoup.sln
index 946b21a..10d7824 100644
--- a/build/win32/vs10/libsoup.sln
+++ b/build/win32/vs10/libsoup.sln
@@ -19,6 +19,10 @@ Global
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
+ Debug_MIT_GSSAPI|Win32 = Debug_MIT_GSSAPI|Win32
+ Debug_MIT_GSSAPI|x64 = Debug_MIT_GSSAPI|x64
+ Release_MIT_GSSAPI|Win32 = Release_MIT_GSSAPI|Win32
+ Release_MIT_GSSAPI|x64 = Release_MIT_GSSAPI|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -29,6 +33,14 @@ Global
{D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.Build.0 = Release|Win32
{D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.ActiveCfg = Release|x64
{D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.Build.0 = Release|x64
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|Win32.ActiveCfg =
Debug_MIT_GSSAPI|Win32
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug_MIT_GSSAPI|Win32
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug_MIT_GSSAPI|x64
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|x64.Build.0 = Debug_MIT_GSSAPI|x64
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|Win32.ActiveCfg =
Release_MIT_GSSAPI|Win32
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|Win32.Build.0 =
Release_MIT_GSSAPI|Win32
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|x64.ActiveCfg =
Release_MIT_GSSAPI|x64
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|x64.Build.0 = Release_MIT_GSSAPI|x64
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.ActiveCfg = Debug|Win32
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.Build.0 = Debug|Win32
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.ActiveCfg = Debug|x64
@@ -37,6 +49,14 @@ Global
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.Build.0 = Release|Win32
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.ActiveCfg = Release|x64
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.Build.0 = Release|x64
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.ActiveCfg = Debug|Win32
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.Build.0 = Debug|Win32
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.ActiveCfg = Debug|x64
@@ -45,6 +65,14 @@ Global
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.Build.0 = Release|Win32
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.ActiveCfg = Release|x64
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.Build.0 = Release|x64
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.ActiveCfg = Debug|Win32
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.Build.0 = Debug|Win32
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.ActiveCfg = Debug|x64
@@ -53,6 +81,14 @@ Global
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.Build.0 = Release|Win32
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.ActiveCfg = Release|x64
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.Build.0 = Release|x64
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.ActiveCfg = Debug|Win32
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.Build.0 = Debug|Win32
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.ActiveCfg = Debug|x64
@@ -61,6 +97,14 @@ Global
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.Build.0 = Release|Win32
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.ActiveCfg = Release|x64
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.Build.0 = Release|x64
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.ActiveCfg = Debug|Win32
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.Build.0 = Debug|Win32
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.ActiveCfg = Debug|x64
@@ -69,6 +113,14 @@ Global
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.Build.0 = Release|Win32
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.ActiveCfg = Release|x64
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.Build.0 = Release|x64
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs10/soup-dll-build-defines.props b/build/win32/vs10/soup-dll-build-defines.props
index 4708801..40591ff 100644
--- a/build/win32/vs10/soup-dll-build-defines.props
+++ b/build/win32/vs10/soup-dll-build-defines.props
@@ -5,7 +5,11 @@
</ImportGroup>
<PropertyGroup Label="UserMacros">
<SoupBuildDefines>LIBSOUP_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="libsoup"</SoupBuildDefines>
+ <SoupMITGSSAPIBuildDefines>LIBSOUP_HAVE_GSSAPI</SoupMITGSSAPIBuildDefines>
<SoupExtraDepLibs>libxml2.lib;sqlite3.lib;intl.lib;ws2_32.lib</SoupExtraDepLibs>
+ <MITGSSAPILibBaseName>gssapi</MITGSSAPILibBaseName>
+ <MITGSSAPILibNameSuffixX86>32.lib</MITGSSAPILibNameSuffixX86>
+ <MITGSSAPILibNameSuffixX64>64.lib</MITGSSAPILibNameSuffixX64>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>soupdllbuilddefinesprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/soup.vcxprojin b/build/win32/vs10/soup.vcxprojin
index 8f43680..a20700b 100644
--- a/build/win32/vs10/soup.vcxprojin
+++ b/build/win32/vs10/soup.vcxprojin
@@ -17,6 +17,22 @@
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug_MIT_GSSAPI|Win32">
+ <Configuration>Debug_MIT_GSSAPI</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug_MIT_GSSAPI|x64">
+ <Configuration>Debug_MIT_GSSAPI</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release_MIT_GSSAPI|Win32">
+ <Configuration>Release_MIT_GSSAPI</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release_MIT_GSSAPI|x64">
+ <Configuration>Release_MIT_GSSAPI</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D83A3162-B14C-459C-AF81-15BBFA90240D}</ProjectGuid>
@@ -24,36 +40,62 @@
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="soup-dll-build-defines.props" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="soup-dll-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="soup-dll-build-defines.props" />
</ImportGroup>
@@ -61,23 +103,31 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="soup-dll-build-defines.props" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="soup-dll-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="soup-dll-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="soup-dll-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="soup-dll-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'"><LinkIncremental>true</LinkIncremental><OutDir>Debug\$(Platform)\bin\</OutDir></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'"><LinkIncremental>true</LinkIncremental><OutDir>Debug\$(Platform)\bin\</OutDir></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'"><LinkIncremental>false</LinkIncremental><OutDir>Release\$(Platform)\bin\</OutDir></PropertyGroup>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'"><LinkIncremental>false</LinkIncremental><OutDir>Release\$(Platform)\bin\</OutDir></PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -96,6 +146,24 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<PreprocessorDefinitions>_DEBUG;$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader />
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>$(SoupExtraDepLibs);$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX86);%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
@@ -116,6 +184,26 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+
<PreprocessorDefinitions>$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader />
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>$(SoupExtraDepLibs);$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX86);%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
@@ -137,6 +225,27 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<PreprocessorDefinitions>_DEBUG;$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader />
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>$(SoupExtraDepLibs);$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX64);%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
@@ -160,6 +269,29 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+
<PreprocessorDefinitions>$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader />
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>$(SoupExtraDepLibs);$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX64);%(AdditionalDependencies)</AdditionalDependencies>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
<ItemGroup>
#include "soup.vs10.sourcefiles"
</ItemGroup>
@@ -177,6 +309,18 @@
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from
config.h.win32...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
<Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">Copying config.h from
config.h.win32...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">$(CopyConfigH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">Copying config.h from
config.h.win32...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">$(CopyConfigH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">Copying config.h from
config.h.win32...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">$(CopyConfigH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">Copying config.h from
config.h.win32...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">$(CopyConfigH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">..\..\..\config.h;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\data\effective_tld_names.dat">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating tld_data.inc...</Message>
@@ -191,6 +335,18 @@
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating tld_data.inc...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenTldDataInc)</Command>
<Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">Generating
tld_data.inc...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">$(GenTldDataInc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">Generating
tld_data.inc...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">$(GenTldDataInc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">Generating
tld_data.inc...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">$(GenTldDataInc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">Generating
tld_data.inc...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">$(GenTldDataInc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">..\..\..\libsoup\tld_data.inc;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\..\libsoup\soup-version.h.in">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating
soup-version.h...</Message>
@@ -205,6 +361,18 @@
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating
soup-version.h...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenSoupVersionH)</Command>
<Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">Generating
soup-version.h...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">$(GenSoupVersionH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|Win32'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">Generating
soup-version.h...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">$(GenSoupVersionH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_MIT_GSSAPI|x64'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">Generating
soup-version.h...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">$(GenSoupVersionH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|Win32'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">Generating
soup-version.h...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">$(GenSoupVersionH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_MIT_GSSAPI|x64'">..\..\..\libsoup\soup-version.h;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/win32/vs9/libsoup.sln b/build/win32/vs9/libsoup.sln
index 5bea19e..d738f8e 100644
--- a/build/win32/vs9/libsoup.sln
+++ b/build/win32/vs9/libsoup.sln
@@ -38,6 +38,10 @@ Global
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
+ Debug_MIT_GSSAPI|Win32 = Debug_MIT_GSSAPI|Win32
+ Debug_MIT_GSSAPI|x64 = Debug_MIT_GSSAPI|x64
+ Release_MIT_GSSAPI|Win32 = Release_MIT_GSSAPI|Win32
+ Release_MIT_GSSAPI|x64 = Release_MIT_GSSAPI|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -48,6 +52,14 @@ Global
{D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.Build.0 = Release|Win32
{D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.ActiveCfg = Release|x64
{D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.Build.0 = Release|x64
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|Win32.ActiveCfg =
Debug_MIT_GSSAPI|Win32
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug_MIT_GSSAPI|Win32
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug_MIT_GSSAPI|x64
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|x64.Build.0 = Debug_MIT_GSSAPI|x64
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|Win32.ActiveCfg =
Release_MIT_GSSAPI|Win32
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|Win32.Build.0 =
Release_MIT_GSSAPI|Win32
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|x64.ActiveCfg =
Release_MIT_GSSAPI|x64
+ {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|x64.Build.0 = Release_MIT_GSSAPI|x64
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.ActiveCfg = Debug|Win32
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.Build.0 = Debug|Win32
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.ActiveCfg = Debug|x64
@@ -56,6 +68,14 @@ Global
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.Build.0 = Release|Win32
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.ActiveCfg = Release|x64
{8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.Build.0 = Release|x64
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.ActiveCfg = Debug|Win32
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.Build.0 = Debug|Win32
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.ActiveCfg = Debug|x64
@@ -64,6 +84,14 @@ Global
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.Build.0 = Release|Win32
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.ActiveCfg = Release|x64
{B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.Build.0 = Release|x64
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.ActiveCfg = Debug|Win32
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.Build.0 = Debug|Win32
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.ActiveCfg = Debug|x64
@@ -72,6 +100,14 @@ Global
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.Build.0 = Release|Win32
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.ActiveCfg = Release|x64
{80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.Build.0 = Release|x64
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.ActiveCfg = Debug|Win32
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.Build.0 = Debug|Win32
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.ActiveCfg = Debug|x64
@@ -80,6 +116,14 @@ Global
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.Build.0 = Release|Win32
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.ActiveCfg = Release|x64
{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.Build.0 = Release|x64
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.ActiveCfg = Debug|Win32
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.Build.0 = Debug|Win32
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.ActiveCfg = Debug|x64
@@ -88,6 +132,14 @@ Global
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.Build.0 = Release|Win32
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.ActiveCfg = Release|x64
{E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.Build.0 = Release|x64
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64
+ {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs9/soup-dll-build-defines.vsprops b/build/win32/vs9/soup-dll-build-defines.vsprops
index 033cdd3..02d0547 100644
--- a/build/win32/vs9/soup-dll-build-defines.vsprops
+++ b/build/win32/vs9/soup-dll-build-defines.vsprops
@@ -19,4 +19,20 @@
Name="SoupExtraDepLibs"
Value="libxml2.lib sqlite3.lib intl.lib ws2_32.lib"
/>
+ <UserMacro
+ Name="SoupMITGSSAPIBuildDefines"
+ Value="LIBSOUP_HAVE_GSSAPI"
+ />
+ <UserMacro
+ Name="MITGSSAPILibBaseName"
+ Value="gssapi"
+ />
+ <UserMacro
+ Name="MITGSSAPILibNameSuffixX86"
+ Value="32.lib"
+ />
+ <UserMacro
+ Name="MITGSSAPILibNameSuffixX64"
+ Value="64.lib"
+ />
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/soup.vcprojin b/build/win32/vs9/soup.vcprojin
index a35440b..efd71ef 100644
--- a/build/win32/vs9/soup.vcprojin
+++ b/build/win32/vs9/soup.vcprojin
@@ -46,6 +46,33 @@
/>
</Configuration>
<Configuration
+ Name="Debug_MIT_GSSAPI|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\soup-dll-build-defines.vsprops"
+ OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
PreprocessorDefinitions="_DEBUG;$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(SoupExtraDepLibs)
$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX86)"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\soup-dll-build-defines.vsprops"
@@ -75,6 +102,36 @@
/>
</Configuration>
<Configuration
+ Name="Release_MIT_GSSAPI|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\soup-dll-build-defines.vsprops"
+ OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(SoupExtraDepLibs)
$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX86)"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
Name="Debug|x64"
ConfigurationType="2"
InheritedPropertySheets=".\soup-dll-build-defines.vsprops"
@@ -105,6 +162,37 @@
/>
</Configuration>
<Configuration
+ Name="Debug_MIT_GSSAPI|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\soup-dll-build-defines.vsprops"
+ OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
PreprocessorDefinitions="_DEBUG;$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(SoupExtraDepLibs)
$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX64)"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
Name="Release|x64"
ConfigurationType="2"
InheritedPropertySheets=".\soup-dll-build-defines.vsprops"
@@ -137,6 +225,40 @@
TargetMachine="17"
/>
</Configuration>
+ <Configuration
+ Name="Release_MIT_GSSAPI|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\soup-dll-build-defines.vsprops"
+ OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="$(SoupExtraDepLibs)
$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX64)"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -161,21 +283,33 @@
>
<File RelativePath="..\..\..\config.h.win32">
<FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
<FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
<FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
<FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|x64"><Tool
Name="VCCustomBuildTool" Description="Copying config.h from config.h.win32..." CommandLine="$(CopyConfigH)"
Outputs="..\..\..\config.h" /></FileConfiguration>
</File>
<File RelativePath="..\..\..\data\effective_tld_names.dat">
<FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
<FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
<FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|x64"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
<FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|x64"><Tool
Name="VCCustomBuildTool" Description="Generating tld_data.inc..." CommandLine="$(GenTldDataInc)"
Outputs="..\..\..\libsoup\tld_data.inc" /></FileConfiguration>
</File>
<File RelativePath="..\..\..\libsoup\soup-version.h.in">
<FileConfiguration Name="Debug|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
<FileConfiguration Name="Release|Win32"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|Win32"><Tool
Name="VCCustomBuildTool" Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
<FileConfiguration Name="Debug|x64"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Debug_MIT_GSSAPI|x64"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
<FileConfiguration Name="Release|x64"><Tool Name="VCCustomBuildTool"
Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
+ <FileConfiguration Name="Release_MIT_GSSAPI|x64"><Tool
Name="VCCustomBuildTool" Description="Generating soup-version.h..." CommandLine="$(GenSoupVersionH)"
Outputs="..\..\..\libsoup\soup-version.h" /></FileConfiguration>
</File>
</Filter>
</Files>
diff --git a/config.h.win32.in b/config.h.win32.in
index 93e6d14..6231dad 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -65,6 +65,10 @@
#defin HAVE_UNISTD_H 1
#endif
+/* Whether or not GSSAPI libs are available */
+/* Note: This is activated in the projects when the appropriate config is selected */
+/* #undef LIBSOUP_HAVE_GSSAPI */
+
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#define LT_OBJDIR ".libs/"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
