Backport of svn 453: Andre Sodermans (wienerschnitzel) patch for building

libupnp under windows systems with VC8/VC9. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@460 119443c7-1b9e-41f8-b6fc-b9c35fce742c
2008-07-24 11:40:33 +00:00
parent f22a69b487
commit 423808a095
8 changed files with 481 additions and 302 deletions
--- a/6
+++ b/6
@@ -2,7 +2,7 @@
 Version 1.6.7
 *******************************************************************************

-2008-06-30 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+2008-07-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* SF Bug Tracker [ 2026431 ] pupnp does not build on GNU/KfreeBSD.
 	Submitted By: Nick Leverton - leveret
 	Gnu/KFreeBSD is one of the Debian architectures, it includes a FreeBSD
@@ -13,6 +13,10 @@ Version 1.6.7
 	Since the test is a simple check for defined(__GLIBC__), this would
 	presumably also help with other ports of GNU libc to non-Linux kernels.

+2008-07-16 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Andre Sodermans (wienerschnitzel) patch for building libupnp under
+	windows systems with VC9. This one fixes a missing include.
+
 2008-06-30 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* Added an m4 macro to deal with finding libupnp in the users'
 	configure script.
--- a/build/vc8/ixml.vcproj
+++ b/build/vc8/ixml.vcproj
@@ -1,223 +1,217 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ixml"
-	ProjectGUID="{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}"
-	RootNamespace="ixml"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc"
-				PreprocessorDefinitions="WIN32;DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				RuntimeLibrary="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\ixml\src\attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\document.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\element.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixml.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlmembuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlparser.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\namedNodeMap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\node.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\nodeList.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\ixml\inc\ixml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ixml"
+	ProjectGUID="{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}"
+	RootNamespace="ixml"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc"
+				PreprocessorDefinitions="WIN32;IXML_INLINE="
+				RuntimeLibrary="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\ixml\src\attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\document.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\element.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixml.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmldebug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlmembuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlparser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\namedNodeMap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\node.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\nodeList.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\ixml\inc\ixml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\inc\ixmldebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/build/vc8/libupnp.vcproj
+++ b/build/vc8/libupnp.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="libupnp"
 	ProjectGUID="{6227F51A-1498-4C4A-B213-F6FDED605125}"
+	RootNamespace="libupnp"
 	>
 	<Platforms>
 		<Platform
@@ -15,8 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -48,18 +49,19 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\pthreads\include,..\ixml\src\inc,..\ixml\inc,..\threadutil\inc,..\upnp\inc,..\upnp\src\inc,.\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP"
+				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/libupnp.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				AssemblerListingLocation="$(OutDir)\"
+				ObjectFile="$(OutDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -74,8 +76,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
-				OutputFile=".\Release/libupnp.dll"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib  iphlpapi.lib"
+				OutputFile="$(OutDir)\libupnp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/libupnp.pdb"
@@ -144,7 +146,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
-				PreprocessorDefinitions="DEBUG;WIN32;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP"
+				PreprocessorDefinitions="DEBUG;WIN32;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -156,6 +158,7 @@
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -170,10 +173,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib ixml.lib"
 				OutputFile="$(OutDir)\libupnp.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(OutDir)\..\ixml"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\libupnp.pdb"
 				ImportLibrary="$(OutDir)\libupnp.lib"
@@ -214,6 +218,14 @@
 			Name="sources"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath="..\..\upnp\src\api\ActionComplete.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\ActionRequest.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ixml\src\attr.c"
 				>
@@ -222,6 +234,10 @@
 				RelativePath="..\..\upnp\src\genlib\client_table\client_table.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\Discovery.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ixml\src\document.c"
 				>
@@ -230,6 +246,18 @@
 				RelativePath="..\..\ixml\src\element.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\Event.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\EventSubscribe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\FileInfo.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\threadutil\src\FreeList.c"
 				>
@@ -330,6 +358,10 @@
 				RelativePath="..\..\upnp\src\ssdp\ssdp_device.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\ssdp\ssdp_server.c"
 				>
@@ -338,10 +370,22 @@
 				RelativePath="..\..\upnp\src\genlib\net\http\statcodes.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\StateVarComplete.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\StateVarRequest.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\genlib\util\strintmap.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\SubscriptionRequest.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\uuid\sysdep.c"
 				>
@@ -366,6 +410,10 @@
 				RelativePath="..\..\upnp\src\api\upnpdebug.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\UpnpString.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\api\upnptools.c"
 				>
@@ -399,6 +447,14 @@
 			Name="headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath="..\..\upnp\inc\ActionComplete.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\actionrequest.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\client_table.h"
 				>
@@ -407,6 +463,22 @@
 				RelativePath="..\..\upnp\src\inc\config.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\discovery.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\Event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\EventSubscribe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\FileInfo.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\gena.h"
 				>
@@ -479,6 +551,10 @@
 				RelativePath="..\..\upnp\src\inc\sock.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\ssdplib.h"
 				>
@@ -487,6 +563,14 @@
 				RelativePath="..\..\upnp\src\inc\statcodes.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\StateVarComplete.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\statevarrequest.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\statuscodes.h"
 				>
@@ -495,6 +579,10 @@
 				RelativePath="..\..\upnp\src\inc\strintmap.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\SubscriptionRequest.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\sysdep.h"
 				>
@@ -503,6 +591,10 @@
 				RelativePath="..\..\upnp\src\inc\unixutil.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnp.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\upnp_timeout.h"
 				>
@@ -519,6 +611,14 @@
 				RelativePath="..\..\upnp\inc\upnpdebug.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\UpnpString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnptools.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\uri.h"
 				>
@@ -544,11 +644,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="resources"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
 		<File
 			RelativePath="..\..\..\..\libupnp_win32.patch"
 			>
--- a/build/vc9/ixml.vcproj
+++ b/build/vc9/ixml.vcproj
@@ -20,7 +20,7 @@
 			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
-			CharacterSet="2"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,8 +40,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc"
-				PreprocessorDefinitions="DEBUG;WIN32"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -78,10 +78,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -103,6 +103,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -118,18 +120,11 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -139,9 +134,6 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -171,6 +163,10 @@
 				RelativePath="..\..\ixml\src\ixml.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmldebug.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ixml\src\ixmlmembuf.c"
 				>
@@ -201,6 +197,10 @@
 				RelativePath="..\..\ixml\inc\ixml.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\ixml\inc\ixmldebug.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
 				>
@@ -210,12 +210,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
--- a/build/vc9/libupnp.sln
+++ b/build/vc9/libupnp.sln
@@ -1,35 +1,29 @@

 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "libupnp.vcproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "ixml.vcproj", "{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "threadutil.vcproj", "{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvctrlpt", "tvctrlpt.vcproj", "{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvdevice", "tvdevice.vcproj", "{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcproj", "{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
 	EndProjectSection
 EndProject
 Global
--- a/build/vc9/libupnp.vcproj
+++ b/build/vc9/libupnp.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="libupnp"
 	ProjectGUID="{6227F51A-1498-4C4A-B213-F6FDED605125}"
+	RootNamespace="libupnp"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -16,13 +17,13 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -50,9 +51,9 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\pthreads\include,..\ixml\src\inc,..\ixml\inc,..\threadutil\inc,..\upnp\inc,..\upnp\src\inc,.\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/libupnp.pch"
 				AssemblerListingLocation=".\Release/"
@@ -75,7 +76,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib"
 				OutputFile=".\Release/libupnp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -117,7 +118,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -144,10 +145,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
-				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile="$(OutDir)\libupnp.pch"
 				AssemblerListingLocation="$(OutDir)\"
 				ObjectFile="$(OutDir)\"
@@ -170,7 +171,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib $(TargetDir)..\ixml\ixml.lib"
 				OutputFile="$(OutDir)\libupnp.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -213,6 +214,14 @@
 			Name="sources"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath="..\..\upnp\src\api\ActionComplete.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\ActionRequest.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ixml\src\attr.c"
 				>
@@ -221,6 +230,10 @@
 				RelativePath="..\..\upnp\src\genlib\client_table\client_table.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\Discovery.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ixml\src\document.c"
 				>
@@ -229,6 +242,18 @@
 				RelativePath="..\..\ixml\src\element.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\Event.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\EventSubscribe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\FileInfo.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\threadutil\src\FreeList.c"
 				>
@@ -329,6 +354,10 @@
 				RelativePath="..\..\upnp\src\ssdp\ssdp_device.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\ssdp\ssdp_server.c"
 				>
@@ -337,10 +366,22 @@
 				RelativePath="..\..\upnp\src\genlib\net\http\statcodes.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\StateVarComplete.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\StateVarRequest.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\genlib\util\strintmap.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\SubscriptionRequest.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\uuid\sysdep.c"
 				>
@@ -365,6 +406,10 @@
 				RelativePath="..\..\upnp\src\api\upnpdebug.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\UpnpString.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\api\upnptools.c"
 				>
@@ -398,6 +443,14 @@
 			Name="headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath="..\..\upnp\inc\ActionComplete.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\ActionRequest.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\client_table.h"
 				>
@@ -406,6 +459,22 @@
 				RelativePath="..\..\upnp\src\inc\config.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\Discovery.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\Event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\EventSubscribe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\FileInfo.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\gena.h"
 				>
@@ -478,6 +547,10 @@
 				RelativePath="..\..\upnp\src\inc\sock.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\ssdplib.h"
 				>
@@ -486,6 +559,14 @@
 				RelativePath="..\..\upnp\src\inc\statcodes.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\StateVarComplete.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\StateVarRequest.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\statuscodes.h"
 				>
@@ -494,6 +575,10 @@
 				RelativePath="..\..\upnp\src\inc\strintmap.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\SubscriptionRequest.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\sysdep.h"
 				>
@@ -502,6 +587,10 @@
 				RelativePath="..\..\upnp\src\inc\unixutil.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnp.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\upnp_timeout.h"
 				>
@@ -518,6 +607,14 @@
 				RelativePath="..\..\upnp\inc\upnpdebug.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\inc\UpnpString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnptools.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\uri.h"
 				>
@@ -543,11 +640,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="resources"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
 		<File
 			RelativePath="..\..\..\..\libupnp_win32.patch"
 			>
--- a/build/vc9/threadutil.vcproj
+++ b/build/vc9/threadutil.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="threadutil"
 	ProjectGUID="{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
 	RootNamespace="threadutil"
@@ -20,7 +20,7 @@
 			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
-			CharacterSet="2"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -41,12 +41,13 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;DEBUG"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -80,10 +81,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -105,10 +106,13 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
--- a/build/vc9/tvcombo.vcproj
+++ b/build/vc9/tvcombo.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="tvcombo"
 	ProjectGUID="{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
 	RootNamespace="tvcombo"
@@ -47,6 +47,7 @@
 				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -59,8 +60,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;.\out.vc9.$(ConfigurationName)\ixml&quot;;&quot;.\out.vc9.$(ConfigurationName)\threadutil&quot;;&quot;.\out.vc9.$(ConfigurationName)\libupnp&quot;"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib $(TargetDir)..\libupnp\libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(TargetDir)..\ixml&quot;;&quot;$(TargetDir)..\threadutil&quot;;&quot;$(TargetDir)..\libupnp&quot;"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -88,8 +89,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,6 +118,7 @@
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"