updated libxml2 win32 package to 2.6.24

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@88 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/CHANGES b/CHANGES
index 86d43918ed918ed02c4a96b8b2b1d863958851a6..a82e11b397e82172ce47fe786eacab41e2640eef 100644 (file)
--- 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 a769c5dbf6e5afc2175566694c573cd50b040b6d..b425d465e68ff2c2bf311fad4a4f022b25abc2e3 100644 (file)
--- 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 bc88f8d292d9c40ae7e049c06066c7ff97bf7067..6d2e8fe42de37dedc32fe15b7abaf72349480f64 100644 (file)
--- a/include/include.vcproj
+++ b/include/include.vcproj
@@ -19,7 +19,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;../include&quot;;&quot;../libs&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
                                StringPooling="TRUE"\r
                                MinimalRebuild="TRUE"\r
@@ -70,7 +70,7 @@
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="TRUE"\r
                                OptimizeForWindowsApplication="TRUE"\r
-                               AdditionalIncludeDirectories="&quot;../include&quot;;&quot;../libs&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r

diff --git a/install.py b/install.py
index 505bd943377cbdbb10ea1ace21488ae2fc334b3b..69fc6253ab24c9f82c431554fe9d41432ec16aef 100644 (file)
--- 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 2894ed08e38c7290142ce0fec5b551ed4ae61fe2..4820946c82a7ccd47dca92b1352bce528a81da8f 100644 (file)
--- 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 f1a27fbdae8cbfadc01a14ffb7236d991e45d65e..d73bb4c4613c6245a69354f061c113eea38e07c9 100644 (file)
--- a/libs/profile/profile.vcproj
+++ b/libs/profile/profile.vcproj
@@ -19,7 +19,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;../../include&quot;;&quot;../../libs&quot;;&quot;../../../STLport-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
                                StringPooling="TRUE"\r
                                MinimalRebuild="TRUE"\r
@@ -68,7 +68,7 @@
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="TRUE"\r
                                OptimizeForWindowsApplication="TRUE"\r
-                               AdditionalIncludeDirectories="&quot;../../include&quot;;&quot;../../libs&quot;;&quot;../../../STLport-4.6/stlport&quot;;&quot;../../../libxml2-2.6/include&quot;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r

diff --git a/plugins/mapxml/mapxml.vcproj b/plugins/mapxml/mapxml.vcproj
index 1ce719ae0dd7b1500c7b5b361ecd37582ac52a77..6578b8608e2f88ba194177a8cade622fae5884b8 100644 (file)
--- a/plugins/mapxml/mapxml.vcproj
+++ b/plugins/mapxml/mapxml.vcproj
@@ -19,7 +19,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               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;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS"\r
                                StringPooling="TRUE"\r
                                MinimalRebuild="TRUE"\r
@@ -42,7 +42,7 @@
                                OutputFile="$(OutDir)/mapxml.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../../libxml2-2.6/win32/lib&quot;;&quot;../../../gtk2-2.4/lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../../libxml2-2.6/lib&quot;;&quot;../../../gtk2-2.4/lib&quot;"\r
                                IgnoreDefaultLibraryNames="msvcprtd.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
                                GenerateDebugInformation="TRUE"\r
@@ -88,7 +88,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\modul
                                EnableIntrinsicFunctions="TRUE"\r
                                FavorSizeOrSpeed="1"\r
                                OptimizeForWindowsApplication="FALSE"\r
-                               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;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
@@ -108,7 +108,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\modul
                                OutputFile="$(OutDir)/mapxml.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../../libxml2-2.6/win32/lib&quot;;&quot;../../../gtk2-2.4/lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../../libxml2-2.6/lib&quot;;&quot;../../../gtk2-2.4/lib&quot;"\r
                                IgnoreDefaultLibraryNames="msvcprt.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
                                GenerateDebugInformation="TRUE"\r

diff --git a/radiant/GtkRadiant.vcproj b/radiant/GtkRadiant.vcproj
index 263a85f63402c98f59876574d25030c263f2cf4b..b8a849e01db0d692c919e1748b1cd7a57514df16 100644 (file)
--- a/radiant/GtkRadiant.vcproj
+++ b/radiant/GtkRadiant.vcproj
@@ -20,7 +20,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               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;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                StringPooling="TRUE"\r
                                MinimalRebuild="TRUE"\r
@@ -43,7 +43,7 @@
                                OutputFile="$(OutDir)/$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/win32/lib&quot;;&quot;../libs/profile/debug/&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/debug/&quot;"\r
                                IgnoreAllDefaultLibraries="TRUE"\r
                                IgnoreDefaultLibraryNames="msvcprtd.lib"\r
                                GenerateDebugInformation="TRUE"\r
@@ -94,7 +94,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot;  &quot;$(SolutionDir)install&quot
                                EnableIntrinsicFunctions="TRUE"\r
                                FavorSizeOrSpeed="1"\r
                                OptimizeForWindowsApplication="TRUE"\r
-                               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;"\r
+                               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;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
@@ -114,7 +114,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot;  &quot;$(SolutionDir)install&quot
                                OutputFile="$(OutDir)/$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/win32/lib&quot;;&quot;../libs/profile/release/&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/release/&quot;"\r
                                IgnoreAllDefaultLibraries="TRUE"\r
                                IgnoreDefaultLibraryNames="msvcprt.lib"\r
                                GenerateDebugInformation="TRUE"\r

diff --git a/tools/quake2/q2map/q2map.vcproj b/tools/quake2/q2map/q2map.vcproj
index ca729b000e4c4d5a3c0f99956a7da3e802ec8147..50e48ef06cf0a29cb4092916eaa77a34ba217ab0 100644 (file)
--- a/tools/quake2/q2map/q2map.vcproj
+++ b/tools/quake2/q2map/q2map.vcproj
@@ -21,7 +21,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\..\iconv-1.9\include&quot;"\r
                                PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"\r
                                ExceptionHandling="FALSE"\r
                                BasicRuntimeChecks="0"\r
@@ -45,7 +45,7 @@
                                OutputFile=".\Debug/q2map.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\win32\lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\lib&quot;"\r
                                IgnoreDefaultLibraryNames="libcd"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile=".\Debug/q2map.pdb"\r
@@ -96,7 +96,7 @@
                                FavorSizeOrSpeed="1"\r
                                OptimizeForProcessor="2"\r
                                OptimizeForWindowsApplication="TRUE"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\common;..\..\..\libs;&quot;..\..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\..\iconv-1.9\include&quot;"\r
                                PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
@@ -122,7 +122,7 @@
                                OutputFile=".\Release/q2map.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\win32\lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\lib&quot;"\r
                                ProgramDatabaseFile=".\Release/q2map.pdb"\r
                                GenerateMapFile="TRUE"\r
                                MapFileName=".\Release/q2map.map"\r

diff --git a/tools/quake2/qdata/qdata3.vcproj b/tools/quake2/qdata/qdata3.vcproj
index 328a7f2f6c402eb7da85e7c9b4a3355ee0ed55ea..239e990a81ce826b3a4cf81ebb06660983f4d03c 100644 (file)
--- a/tools/quake2/qdata/qdata3.vcproj
+++ b/tools/quake2/qdata/qdata3.vcproj
@@ -43,7 +43,7 @@
                                OutputFile=".\Debug/qdata3.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\..\libs\mathlib\Debug;..\..\..\libs\l_net\Debug;"..\..\..\..\libxml2\win32\binaries-debug""\r
+                               AdditionalLibraryDirectories="..\..\..\libs\mathlib\Debug;..\..\..\libs\l_net\Debug;"..\..\..\..\libxml2-2.6\lib""\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile=".\Debug/qdata3.pdb"\r
                                GenerateMapFile="TRUE"\r
@@ -101,7 +101,7 @@
                                OutputFile=".\Release/qdata3.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\..\libs\mathlib\Release;..\..\..\libs\l_net\Release;"..\..\..\..\libxml2\win32\binaries-release""\r
+                               AdditionalLibraryDirectories="..\..\..\libs\mathlib\Release;..\..\..\libs\l_net\Release;"..\..\..\..\libxml2-2.6\lib""\r
                                ProgramDatabaseFile=".\Release/qdata3.pdb"\r
                                GenerateMapFile="TRUE"\r
                                MapFileName=".\Release/qdata3.map"\r

diff --git a/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj b/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj
index 0685e02875b354d4ed479186dd04ccccf5da7b8c..2eea928686fb3364b55dae4a930f18c83657bb3a 100644 (file)
--- a/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj
+++ b/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj
@@ -44,7 +44,7 @@
                                OutputFile="Release/qdata3.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\..\libs\l_net\release,..\..\..\..\libxml2\win32\libxml2\release_so,..\..\..\libs\mathlib\release"\r
+                               AdditionalLibraryDirectories="..\..\..\libs\l_net\release,..\..\..\..\libxml2-2.6\lib,..\..\..\libs\mathlib\release"\r
                                ProgramDatabaseFile=".\Release/qdata3.pdb"\r
                                GenerateMapFile="TRUE"\r
                                MapFileName=".\Release/qdata3.map"\r
@@ -100,7 +100,7 @@
                                OutputFile="Debug/qdata3.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\..\libs\l_net\debug,..\..\..\..\libxml2\win32\libxml2\debug_so,..\..\..\libs\mathlib\debug"\r
+                               AdditionalLibraryDirectories="..\..\..\libs\l_net\debug,..\..\..\..\libxml2-2.6\lib,..\..\..\libs\mathlib\debug"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile=".\Debug/qdata3.pdb"\r
                                GenerateMapFile="TRUE"\r
@@ -301,7 +301,7 @@
                        Name="debug"\r
                        Filter="">\r
                        <File\r
-                               RelativePath="..\..\..\..\libxml2\win32\binaries-debug\libxml2.lib">\r
+                               RelativePath="..\..\..\..\libxml2-2.6\lib\libxml2.lib">\r
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                        ExcludedFromBuild="TRUE">\r
@@ -314,7 +314,7 @@
                        Name="release"\r
                        Filter="">\r
                        <File\r
-                               RelativePath="..\..\..\..\libxml2\win32\binaries-release\libxml2.lib">\r
+                               RelativePath="..\..\..\..\libxml2-2.6\lib\libxml2.lib">\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
                                        ExcludedFromBuild="TRUE">\r

diff --git a/tools/quake3/q3data/q3data.vcproj b/tools/quake3/q3data/q3data.vcproj
index f2330066ad67b851bb593da684a6c6a6efab4fcb..f5a0e16316f3bcb73fa7da087e15334031c07db9 100644 (file)
--- a/tools/quake3/q3data/q3data.vcproj
+++ b/tools/quake3/q3data/q3data.vcproj
@@ -40,7 +40,7 @@
                                OutputFile=".\Debug/q3data.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=""..\..\..\..\libxml2\win32\binaries-debug";..\..\..\libs\l_net\Debug;..\..\..\libs\pak\Debug;"..\..\..\..\gtk2-win32\lib\""\r
+                               AdditionalLibraryDirectories=""..\..\..\..\libxml2-2.6\lib";..\..\..\libs\l_net\Debug;..\..\..\libs\pak\Debug;"..\..\..\..\gtk2-win32\lib\""\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile=".\Debug/q3data.pdb"\r
                                SubSystem="1"\r
@@ -95,7 +95,7 @@
                                OutputFile=".\Release/q3data.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\..\libs\pak\release;..\..\..\libs\l_net\release;"..\..\..\..\libxml2\win32\binaries-release";"..\..\..\..\gtk2-win32\lib\""\r
+                               AdditionalLibraryDirectories="..\..\..\libs\pak\release;..\..\..\libs\l_net\release;"..\..\..\..\libxml2-2.6\lib";"..\..\..\..\gtk2-win32\lib\""\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile=".\Release/q3data.pdb"\r
                                SubSystem="1"\r

diff --git a/tools/quake3/q3map2/q3map2.vcproj b/tools/quake3/q3map2/q3map2.vcproj
index 93b246ae63f0432e894a80056e2dd1632bc72501..8ac9bdeab81ff71312156764a7b1f336debc34c9 100644 (file)
--- a/tools/quake3/q3map2/q3map2.vcproj
+++ b/tools/quake3/q3map2/q3map2.vcproj
@@ -21,7 +21,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               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;"\r
+                               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;"\r
                                PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"\r
                                ExceptionHandling="FALSE"\r
                                BasicRuntimeChecks="0"\r
@@ -45,7 +45,7 @@
                                OutputFile=".\Debug/q3map2.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               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;"\r
+                               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;"\r
                                IgnoreDefaultLibraryNames="libcd"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile=".\Debug/q3map2.pdb"\r
@@ -96,7 +96,7 @@
                                FavorSizeOrSpeed="1"\r
                                OptimizeForProcessor="2"\r
                                OptimizeForWindowsApplication="TRUE"\r
-                               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;"\r
+                               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;"\r
                                PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
@@ -122,7 +122,7 @@
                                OutputFile=".\Release/q3map2.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               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;"\r
+                               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;"\r
                                ProgramDatabaseFile=".\Release/q3map2.pdb"\r
                                GenerateMapFile="TRUE"\r
                                MapFileName=".\Release/q3map2.map"\r