From 3f1d9f4c3baab1b42e86cfbebdf68dbac4f162a4 Mon Sep 17 00:00:00 2001
From: paulc <paulc@acf43c95-373e-0410-b603-e72c3f656dc1>
Date: Sat, 29 Nov 2008 20:27:49 +0000
Subject: [PATCH] Made updater build in Visual Studio 2005.

git-svn-id: http://yate.null.ro/svn/yate/trunk@2378 acf43c95-373e-0410-b603-e72c3f656dc1
---
 modules/qt4/updater.h   |   6 +
 windows/YATE.sln        |  12 +-
 windows/_updater.vcproj | 296 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 313 insertions(+), 1 deletion(-)
 create mode 100644 windows/_updater.vcproj

diff --git a/modules/qt4/updater.h b/modules/qt4/updater.h
index b4e2cab6..967b7911 100644
--- a/modules/qt4/updater.h
+++ b/modules/qt4/updater.h
@@ -27,6 +27,12 @@
 
 #include <yatecbase.h>
 
+#undef open
+#undef read
+#undef close
+#undef write
+#undef mkdir
+
 #define QT_NO_DEBUG
 #define QT_DLL
 #define QT_GUI_LIB
diff --git a/windows/YATE.sln b/windows/YATE.sln
index 19a26ef1..6b008f51 100644
--- a/windows/YATE.sln
+++ b/windows/YATE.sln
@@ -13,6 +13,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "Console.vcproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Extra", "Extra.vcproj", "{B1E0D82A-DB84-4D66-A30D-D028D96D8315}"
 	ProjectSection(ProjectDependencies) = postProject
+		{A9C6A983-C901-5B87-1147-6AD36C5FE4D7} = {A9C6A983-C901-5B87-1147-6AD36C5FE4D7}
 		{2358F303-8EF4-404A-80C8-6E1826B2D423} = {2358F303-8EF4-404A-80C8-6E1826B2D423}
 		{DC897705-0065-4FA0-B1C2-5A3E75240A95} = {DC897705-0065-4FA0-B1C2-5A3E75240A95}
 		{3EA5873D-E3FA-4CA4-B8BB-8FE4183652A1} = {3EA5873D-E3FA-4CA4-B8BB-8FE4183652A1}
@@ -31,7 +32,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libyate", "Libyate.vcproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modules", "Modules.vcproj", "{BE362993-354F-4315-B878-05E952E1D164}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8B54AE6A-9F1B-4B88-20C8-9D7790786A3A} = {8B54AE6A-9F1B-4B88-20C8-9D7790786A3A}
 		{5F248A16-8E3D-497A-8E68-F9E08971F583} = {5F248A16-8E3D-497A-8E68-F9E08971F583}
 		{42B76F17-895F-4B1C-B783-7AAC92AFD56E} = {42B76F17-895F-4B1C-B783-7AAC92AFD56E}
 		{34AC2018-91F1-41AF-A839-47DCF27D4434} = {34AC2018-91F1-41AF-A839-47DCF27D4434}
@@ -46,6 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modules", "Modules.vcproj",
 		{5E489550-A745-4A24-BBC4-FD4BE5333865} = {5E489550-A745-4A24-BBC4-FD4BE5333865}
 		{E8EE0F54-0D2B-48FF-B2AF-6E268442A4D1} = {E8EE0F54-0D2B-48FF-B2AF-6E268442A4D1}
 		{130EC95B-8851-4946-B0B5-6091CE3EFB00} = {130EC95B-8851-4946-B0B5-6091CE3EFB00}
+		{8B54AE6A-9F1B-4B88-20C8-9D7790786A3A} = {8B54AE6A-9F1B-4B88-20C8-9D7790786A3A}
 		{8B67BE6A-B42B-47CA-8188-99A890786A3A} = {8B67BE6A-B42B-47CA-8188-99A890786A3A}
 		{1254C781-292C-48F4-9CB6-93338721E89C} = {1254C781-292C-48F4-9CB6-93338721E89C}
 		{F85C5686-5E6E-490E-99F7-6B8E1776CF71} = {F85C5686-5E6E-490E-99F7-6B8E1776CF71}
@@ -407,6 +408,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_analogdetect", "_analogdet
 		{8330C290-5F71-33E4-A553-162E1BC8424E} = {8330C290-5F71-33E4-A553-162E1BC8424E}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_updater", "_updater.vcproj", "{A9C6A983-C901-5B87-1147-6AD36C5FE4D7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -693,6 +699,10 @@ Global
 		{8B54AE6A-9F1B-4B88-20C8-9D7790786A3A}.Debug|Win32.Build.0 = Debug|Win32
 		{8B54AE6A-9F1B-4B88-20C8-9D7790786A3A}.Release|Win32.ActiveCfg = Release|Win32
 		{8B54AE6A-9F1B-4B88-20C8-9D7790786A3A}.Release|Win32.Build.0 = Release|Win32
+		{A9C6A983-C901-5B87-1147-6AD36C5FE4D7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A9C6A983-C901-5B87-1147-6AD36C5FE4D7}.Debug|Win32.Build.0 = Debug|Win32
+		{A9C6A983-C901-5B87-1147-6AD36C5FE4D7}.Release|Win32.ActiveCfg = Release|Win32
+		{A9C6A983-C901-5B87-1147-6AD36C5FE4D7}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/windows/_updater.vcproj b/windows/_updater.vcproj
new file mode 100644
index 00000000..2c844f44
--- /dev/null
+++ b/windows/_updater.vcproj
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="_updater"
+	ProjectGUID="{A9C6A983-C901-5B87-1147-6AD36C5FE4D7}"
+	RootNamespace="_updater"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release\qt4"
+			IntermediateDirectory=".\Release\modules"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/_updater.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".,..,Release"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release\modules/_updater.pch"
+				AssemblerListingLocation=".\Release\modules/"
+				ObjectFile=".\Release\modules/"
+				ProgramDataBaseFileName=".\Release\modules/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="QtCore4.lib QtNetwork4.lib"
+				OutputFile="Release/qt4/updater.yate"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/updater.pdb"
+				ImportLibrary=".\Release/updater.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/_updater.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug\qt4"
+			IntermediateDirectory=".\Debug\modules"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/_updater.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,..,Debug"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile=".\Debug\modules/_updater.pch"
+				AssemblerListingLocation=".\Debug\modules/"
+				ObjectFile=".\Debug\modules/"
+				ProgramDataBaseFileName=".\Debug\modules/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="QtCoreD4.lib QtNetworkD4.lib"
+				OutputFile="Debug/qt4/updater.yate"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/updater.pdb"
+				ImportLibrary=".\Debug/updater.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/_updater.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\modules\qt4\updater.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+			<File
+				RelativePath="version.rc"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\modules\qt4\updater.h"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="moc.exe  -DUNICODE -DWIN32  -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I..\..\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 -o Release\updater.moc ..\modules\qt4\updater.h"
+						Outputs="Release\updater.moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="moc.exe  -DUNICODE -DWIN32  -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I..\..\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 -o Debug\updater.moc ..\modules\qt4\updater.h"
+						Outputs="Debug\updater.moc"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>