updated libxml2 win32 package to 2.6.24
authorspog <spog>
Sun, 9 Jul 2006 14:09:19 +0000 (14:09 +0000)
committerspog <spog>
Sun, 9 Jul 2006 14:09:19 +0000 (14:09 +0000)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@88 8a3a26a2-13c4-0310-b231-cf6edde360e5

13 files changed:
CHANGES
COMPILING
include/include.vcproj
install.py
libs/libs.vcproj
libs/profile/profile.vcproj
plugins/mapxml/mapxml.vcproj
radiant/GtkRadiant.vcproj
tools/quake2/q2map/q2map.vcproj
tools/quake2/qdata/qdata3.vcproj
tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj
tools/quake3/q3data/q3data.vcproj
tools/quake3/q3map2/q3map2.vcproj

diff --git a/CHANGES b/CHANGES
index 86d4391..a82e11b 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.
index a769c5d..b425d46 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)
index bc88f8d..6d2e8fe 100644 (file)
@@ -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
index 505bd94..69fc625 100644 (file)
@@ -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"))
index 2894ed0..4820946 100644 (file)
@@ -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"
index f1a27fb..d73bb4c 100644 (file)
@@ -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
index 1ce719a..6578b86 100644 (file)
@@ -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
index 263a85f..b8a849e 100644 (file)
@@ -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
index ca729b0..50e48ef 100644 (file)
@@ -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
                                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
index 328a7f2..239e990 100644 (file)
@@ -43,7 +43,7 @@
                                OutputFile=".\Debug/qdata3.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\..\libs\mathlib\Debug;..\..\..\libs\l_net\Debug;&quot;..\..\..\..\libxml2\win32\binaries-debug&quot;"\r
+                               AdditionalLibraryDirectories="..\..\..\libs\mathlib\Debug;..\..\..\libs\l_net\Debug;&quot;..\..\..\..\libxml2-2.6\lib&quot;"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile=".\Debug/qdata3.pdb"\r
                                GenerateMapFile="TRUE"\r
                                OutputFile=".\Release/qdata3.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\..\libs\mathlib\Release;..\..\..\libs\l_net\Release;&quot;..\..\..\..\libxml2\win32\binaries-release&quot;"\r
+                               AdditionalLibraryDirectories="..\..\..\libs\mathlib\Release;..\..\..\libs\l_net\Release;&quot;..\..\..\..\libxml2-2.6\lib&quot;"\r
                                ProgramDatabaseFile=".\Release/qdata3.pdb"\r
                                GenerateMapFile="TRUE"\r
                                MapFileName=".\Release/qdata3.map"\r
index 0685e02..2eea928 100644 (file)
@@ -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
                                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
                        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
                        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
index f233006..f5a0e16 100644 (file)
@@ -40,7 +40,7 @@
                                OutputFile=".\Debug/q3data.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2\win32\binaries-debug&quot;;..\..\..\libs\l_net\Debug;..\..\..\libs\pak\Debug;&quot;..\..\..\..\gtk2-win32\lib\&quot;"\r
+                               AdditionalLibraryDirectories="&quot;..\..\..\..\libxml2-2.6\lib&quot;;..\..\..\libs\l_net\Debug;..\..\..\libs\pak\Debug;&quot;..\..\..\..\gtk2-win32\lib\&quot;"\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;&quot;..\..\..\..\libxml2\win32\binaries-release&quot;;&quot;..\..\..\..\gtk2-win32\lib\&quot;"\r
+                               AdditionalLibraryDirectories="..\..\..\libs\pak\release;..\..\..\libs\l_net\release;&quot;..\..\..\..\libxml2-2.6\lib&quot;;&quot;..\..\..\..\gtk2-win32\lib\&quot;"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile=".\Release/q3data.pdb"\r
                                SubSystem="1"\r
index 93b246a..8ac9bde 100644 (file)
@@ -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
                                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