From: spog <spog@8a3a26a2-13c4-0310-b231-cf6edde360e5>
Date: Sun, 9 Jul 2006 14:09:19 +0000 (+0000)
Subject: updated libxml2 win32 package to 2.6.24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97fea66518e0a2a92ddc35e61f09bc0018efe924;p=xonotic%2Fnetradiant.git

updated libxml2 win32 package to 2.6.24

git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@88 8a3a26a2-13c4-0310-b231-cf6edde360e5
---

diff --git a/CHANGES b/CHANGES
index 86d43918..a82e11b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+09/07/2006
+Shaderman
+- Updated win32 libxml2 package to 2.6.24.
+
 11/06/2006
 SPoG
 - Fixed arbitrary rotation X and Y axes appearing to be transposed.
diff --git a/COMPILING b/COMPILING
index a769c5db..b425d465 100644
--- a/COMPILING
+++ b/COMPILING
@@ -56,8 +56,9 @@ environment:
 - subversion 1.1 or later (some build steps use svn)
 
 dependencies are prepackaged archives, extract them to the directory above GtkRadiant.sln:
-- http://zerowing.idsoftware.com/files/radiant/developer/1.5/gtk2-2.4.14.zip (gtk-wimp, gtkglext, gtk, glib, atk, pango, iconv etc)
-- http://zerowing.idsoftware.com/files/radiant/developer/1.5/libxml2-2.6.2.zip
+- http://zerowing.idsoftware.com/files/radiant/developer/1.5/iconv-1.9.zip
+- http://zerowing.idsoftware.com/files/radiant/developer/1.5/gtk2-2.4.14.zip (gtk-wimp, gtkglext, gtk, glib, atk, pango etc)
+- http://zerowing.idsoftware.com/files/radiant/developer/1.5/libxml2-2.6.24.zip
 - http://zerowing.idsoftware.com/files/radiant/developer/1.5/STLport-4.6.2.zip
 - http://zerowing.idsoftware.com/files/radiant/developer/1.5/zlib1-1.2.1.zip (for archivezip module)
 - http://zerowing.idsoftware.com/files/radiant/developer/1.5/libpng-1.2.5.zip (for imagepng module)
diff --git a/include/include.vcproj b/include/include.vcproj
index bc88f8d2..6d2e8fe4 100644
--- a/include/include.vcproj
+++ b/include/include.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../include&quot;;&quot;../libs&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;"
+				AdditionalIncludeDirectories="&quot;../include&quot;;&quot;../libs&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../iconv-1.9/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
@@ -70,7 +70,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="&quot;../include&quot;;&quot;../libs&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;"
+				AdditionalIncludeDirectories="&quot;../include&quot;;&quot;../libs&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../iconv-1.9/include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
diff --git a/install.py b/install.py
index 505bd943..69fc6253 100644
--- a/install.py
+++ b/install.py
@@ -105,7 +105,10 @@ gtk2Root = os.path.normpath(os.path.join(thisDir, "../gtk2-2.4"))
 if os.path.exists(gtk2Root):
   copySvn(os.path.join(gtk2Root, "install"), installRoot)
 
-libxml2 = os.path.normpath(os.path.join(thisDir, "../libxml2-2.6/win32/install/libxml2.dll"))
+iconv = os.path.normpath(os.path.join(thisDir, "../iconv-1.9/bin/iconv.dll"))
+copyFileIfExists(iconv, installRoot)
+
+libxml2 = os.path.normpath(os.path.join(thisDir, "../libxml2-2.6/bin/libxml2.dll"))
 copyFileIfExists(libxml2, installRoot)
 
 libpng = os.path.normpath(os.path.join(thisDir, "../libpng-1.2/lib/libpng13.dll"))
diff --git a/libs/libs.vcproj b/libs/libs.vcproj
index 2894ed08..4820946c 100644
--- a/libs/libs.vcproj
+++ b/libs/libs.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;.&quot;;&quot;../include&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;"
+				AdditionalIncludeDirectories="&quot;.&quot;;&quot;../include&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../iconv-1.9/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
@@ -70,7 +70,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="&quot;.&quot;;&quot;../include&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;"
+				AdditionalIncludeDirectories="&quot;.&quot;;&quot;../include&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../iconv-1.9/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
diff --git a/libs/profile/profile.vcproj b/libs/profile/profile.vcproj
index f1a27fbd..d73bb4c4 100644
--- a/libs/profile/profile.vcproj
+++ b/libs/profile/profile.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include&quot;;&quot;../../libs&quot;;&quot;../../../STLport-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include&quot;;&quot;../../libs&quot;;&quot;../../../STLport-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../iconv-1.9/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
@@ -68,7 +68,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include&quot;;&quot;../../libs&quot;;&quot;../../../STLport-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include&quot;;&quot;../../libs&quot;;&quot;../../../STLport-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../iconv-1.9/include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
diff --git a/plugins/mapxml/mapxml.vcproj b/plugins/mapxml/mapxml.vcproj
index 1ce719ae..6578b860 100644
--- a/plugins/mapxml/mapxml.vcproj
+++ b/plugins/mapxml/mapxml.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;"
+				AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../iconv-1.9/include&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS"
 				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
@@ -42,7 +42,7 @@
 				OutputFile="$(OutDir)/mapxml.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;../../../libxml2-2.6/win32/lib&quot;;&quot;../../../gtk2-2.4/lib&quot;"
+				AdditionalLibraryDirectories="&quot;../../../libxml2-2.6/lib&quot;;&quot;../../../gtk2-2.4/lib&quot;"
 				IgnoreDefaultLibraryNames="msvcprtd.lib"
 				ModuleDefinitionFile="$(ProjectName).def"
 				GenerateDebugInformation="TRUE"
@@ -88,7 +88,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\modul
 				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="1"
 				OptimizeForWindowsApplication="FALSE"
-				AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;"
+				AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../iconv-1.9/include&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -108,7 +108,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\modul
 				OutputFile="$(OutDir)/mapxml.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;../../../libxml2-2.6/win32/lib&quot;;&quot;../../../gtk2-2.4/lib&quot;"
+				AdditionalLibraryDirectories="&quot;../../../libxml2-2.6/lib&quot;;&quot;../../../gtk2-2.4/lib&quot;"
 				IgnoreDefaultLibraryNames="msvcprt.lib"
 				ModuleDefinitionFile="$(ProjectName).def"
 				GenerateDebugInformation="TRUE"
diff --git a/radiant/GtkRadiant.vcproj b/radiant/GtkRadiant.vcproj
index 263a85f6..b8a849e0 100644
--- a/radiant/GtkRadiant.vcproj
+++ b/radiant/GtkRadiant.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../include;../libs;&quot;../../STLPort-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../gtk2-2.4/include/gtkglext-1.0&quot;"
+				AdditionalIncludeDirectories="../include;../libs;&quot;../../STLPort-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../iconv-1.9/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../gtk2-2.4/include/gtkglext-1.0&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
@@ -43,7 +43,7 @@
 				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/win32/lib&quot;;&quot;../libs/profile/debug/&quot;"
+				AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/debug/&quot;"
 				IgnoreAllDefaultLibraries="TRUE"
 				IgnoreDefaultLibraryNames="msvcprtd.lib"
 				GenerateDebugInformation="TRUE"
@@ -94,7 +94,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot;  &quot;$(SolutionDir)install&quot
 				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="1"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="../include;../libs;&quot;../../STLPort-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../gtk2-2.4/include/gtkglext-1.0&quot;"
+				AdditionalIncludeDirectories="../include;../libs;&quot;../../STLPort-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../iconv-1.9/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../gtk2-2.4/include/gtkglext-1.0&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -114,7 +114,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot;  &quot;$(SolutionDir)install&quot
 				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/win32/lib&quot;;&quot;../libs/profile/release/&quot;"
+				AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/release/&quot;"
 				IgnoreAllDefaultLibraries="TRUE"
 				IgnoreDefaultLibraryNames="msvcprt.lib"
 				GenerateDebugInformation="TRUE"
diff --git a/tools/quake2/q2map/q2map.vcproj b/tools/quake2/q2map/q2map.vcproj
index ca729b00..50e48ef0 100644
--- a/tools/quake2/q2map/q2map.vcproj
+++ b/tools/quake2/q2map/q2map.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;"
+				AdditionalIncludeDirectories="..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\..\iconv-1.9\include&quot;"
 				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
 				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="0"
@@ -45,7 +45,7 @@
 				OutputFile=".\Debug/q2map.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\win32\lib&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\lib&quot;"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/q2map.pdb"
@@ -96,7 +96,7 @@
 				FavorSizeOrSpeed="1"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;"
+				AdditionalIncludeDirectories="..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\..\iconv-1.9\include&quot;"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -122,7 +122,7 @@
 				OutputFile=".\Release/q2map.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\win32\lib&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\lib&quot;"
 				ProgramDatabaseFile=".\Release/q2map.pdb"
 				GenerateMapFile="TRUE"
 				MapFileName=".\Release/q2map.map"
diff --git a/tools/quake2/qdata/qdata3.vcproj b/tools/quake2/qdata/qdata3.vcproj
index 328a7f2f..239e990a 100644
--- a/tools/quake2/qdata/qdata3.vcproj
+++ b/tools/quake2/qdata/qdata3.vcproj
@@ -43,7 +43,7 @@
 				OutputFile=".\Debug/qdata3.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\libs\mathlib\Debug;..\..\..\libs\l_net\Debug;&quot;..\..\..\..\libxml2\win32\binaries-debug&quot;"
+				AdditionalLibraryDirectories="..\..\..\libs\mathlib\Debug;..\..\..\libs\l_net\Debug;&quot;..\..\..\..\libxml2-2.6\lib&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/qdata3.pdb"
 				GenerateMapFile="TRUE"
@@ -101,7 +101,7 @@
 				OutputFile=".\Release/qdata3.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\libs\mathlib\Release;..\..\..\libs\l_net\Release;&quot;..\..\..\..\libxml2\win32\binaries-release&quot;"
+				AdditionalLibraryDirectories="..\..\..\libs\mathlib\Release;..\..\..\libs\l_net\Release;&quot;..\..\..\..\libxml2-2.6\lib&quot;"
 				ProgramDatabaseFile=".\Release/qdata3.pdb"
 				GenerateMapFile="TRUE"
 				MapFileName=".\Release/qdata3.map"
diff --git a/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj b/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj
index 0685e028..2eea9286 100644
--- a/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj
+++ b/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj
@@ -44,7 +44,7 @@
 				OutputFile="Release/qdata3.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\libs\l_net\release,..\..\..\..\libxml2\win32\libxml2\release_so,..\..\..\libs\mathlib\release"
+				AdditionalLibraryDirectories="..\..\..\libs\l_net\release,..\..\..\..\libxml2-2.6\lib,..\..\..\libs\mathlib\release"
 				ProgramDatabaseFile=".\Release/qdata3.pdb"
 				GenerateMapFile="TRUE"
 				MapFileName=".\Release/qdata3.map"
@@ -100,7 +100,7 @@
 				OutputFile="Debug/qdata3.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\libs\l_net\debug,..\..\..\..\libxml2\win32\libxml2\debug_so,..\..\..\libs\mathlib\debug"
+				AdditionalLibraryDirectories="..\..\..\libs\l_net\debug,..\..\..\..\libxml2-2.6\lib,..\..\..\libs\mathlib\debug"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/qdata3.pdb"
 				GenerateMapFile="TRUE"
@@ -301,7 +301,7 @@
 			Name="debug"
 			Filter="">
 			<File
-				RelativePath="..\..\..\..\libxml2\win32\binaries-debug\libxml2.lib">
+				RelativePath="..\..\..\..\libxml2-2.6\lib\libxml2.lib">
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE">
@@ -314,7 +314,7 @@
 			Name="release"
 			Filter="">
 			<File
-				RelativePath="..\..\..\..\libxml2\win32\binaries-release\libxml2.lib">
+				RelativePath="..\..\..\..\libxml2-2.6\lib\libxml2.lib">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
diff --git a/tools/quake3/q3data/q3data.vcproj b/tools/quake3/q3data/q3data.vcproj
index f2330066..f5a0e163 100644
--- a/tools/quake3/q3data/q3data.vcproj
+++ b/tools/quake3/q3data/q3data.vcproj
@@ -40,7 +40,7 @@
 				OutputFile=".\Debug/q3data.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2\win32\binaries-debug&quot;;..\..\..\libs\l_net\Debug;..\..\..\libs\pak\Debug;&quot;..\..\..\..\gtk2-win32\lib\&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\lib&quot;;..\..\..\libs\l_net\Debug;..\..\..\libs\pak\Debug;&quot;..\..\..\..\gtk2-win32\lib\&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/q3data.pdb"
 				SubSystem="1"
@@ -95,7 +95,7 @@
 				OutputFile=".\Release/q3data.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\libs\pak\release;..\..\..\libs\l_net\release;&quot;..\..\..\..\libxml2\win32\binaries-release&quot;;&quot;..\..\..\..\gtk2-win32\lib\&quot;"
+				AdditionalLibraryDirectories="..\..\..\libs\pak\release;..\..\..\libs\l_net\release;&quot;..\..\..\..\libxml2-2.6\lib&quot;;&quot;..\..\..\..\gtk2-win32\lib\&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Release/q3data.pdb"
 				SubSystem="1"
diff --git a/tools/quake3/q3map2/q3map2.vcproj b/tools/quake3/q3map2/q3map2.vcproj
index 93b246ae..8ac9bdea 100644
--- a/tools/quake3/q3map2/q3map2.vcproj
+++ b/tools/quake3/q3map2/q3map2.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\mhash-0.9\lib&quot;;..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\..\libpng-1.2&quot;;&quot;..\..\..\..\zlib1-1.2\include&quot;;&quot;..\..\..\..\gtk2-2.4\include\glib-2.0&quot;;&quot;..\..\..\..\gtk2-2.4\lib\glib-2.0\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\mhash-0.9\lib&quot;;..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\..\iconv-1.9\include&quot;;&quot;..\..\..\..\libpng-1.2&quot;;&quot;..\..\..\..\zlib1-1.2\include&quot;;&quot;..\..\..\..\gtk2-2.4\include\glib-2.0&quot;;&quot;..\..\..\..\gtk2-2.4\lib\glib-2.0\include&quot;"
 				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
 				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="0"
@@ -45,7 +45,7 @@
 				OutputFile=".\Debug/q3map2.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\..\..\mhash-0.9\win32\libmhash\Debug&quot;;&quot;..\..\..\..\libxml2-2.6\win32\lib&quot;;&quot;..\..\..\..\zlib1-1.2\lib&quot;;&quot;..\..\..\..\libpng-1.2\lib&quot;;&quot;..\..\..\..\gtk2-2.4\lib&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\mhash-0.9\win32\libmhash\Debug&quot;;&quot;..\..\..\..\libxml2-2.6\lib&quot;;&quot;..\..\..\..\zlib1-1.2\lib&quot;;&quot;..\..\..\..\libpng-1.2\lib&quot;;&quot;..\..\..\..\gtk2-2.4\lib&quot;"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/q3map2.pdb"
@@ -96,7 +96,7 @@
 				FavorSizeOrSpeed="1"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\mhash-0.9\lib&quot;;..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\..\libpng-1.2&quot;;&quot;..\..\..\..\zlib1-1.2\include&quot;;&quot;..\..\..\..\gtk2-2.4\include\glib-2.0&quot;;&quot;..\..\..\..\gtk2-2.4\lib\glib-2.0\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\mhash-0.9\lib&quot;;..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\..\iconv-1.9\include&quot;;&quot;..\..\..\..\libpng-1.2&quot;;&quot;..\..\..\..\zlib1-1.2\include&quot;;&quot;..\..\..\..\gtk2-2.4\include\glib-2.0&quot;;&quot;..\..\..\..\gtk2-2.4\lib\glib-2.0\include&quot;"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -122,7 +122,7 @@
 				OutputFile=".\Release/q3map2.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;..\..\..\..\mhash-0.9\win32\libmhash\Release&quot;;&quot;..\..\..\..\libxml2-2.6\win32\lib&quot;;&quot;..\..\..\..\zlib1-1.2\lib&quot;;&quot;..\..\..\..\libpng-1.2\lib&quot;;&quot;..\..\..\..\gtk2-2.4\lib&quot;"
+				AdditionalLibraryDirectories="&quot;..\..\..\..\mhash-0.9\win32\libmhash\Release&quot;;&quot;..\..\..\..\libxml2-2.6\lib&quot;;&quot;..\..\..\..\zlib1-1.2\lib&quot;;&quot;..\..\..\..\libpng-1.2\lib&quot;;&quot;..\..\..\..\gtk2-2.4\lib&quot;"
 				ProgramDatabaseFile=".\Release/q3map2.pdb"
 				GenerateMapFile="TRUE"
 				MapFileName=".\Release/q3map2.map"