split x86 and x64 build processes

5 files changed, 115 insertions, 78 deletions

diff --git a/build/build-small.bat b/build/build-small.bat
index c6618802..8591f0c7 100644
--- a/build/build-small.bat
+++ b/build/build-small.bat
@@ -23,25 +23,26 @@ nmake /nologo /f makefile.mak
 cd ..\build
 set PATH=%OPATH%
 set DEPS_ROOT=..\dep-x86
-set XCHAT_DEST=..\tmp
+set XCHAT_DEST=..\dist-x86
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
 echo 2> portable-mode
 move portable-mode %XCHAT_DEST%
 copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST%
@@ -49,8 +50,7 @@ copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
diff --git a/build/build-x64.bat b/build/build-x64.bat
index d862736c..49583c7a 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -1,21 +1,32 @@
 @echo off
+set WDK_ROOT=c:\WinDDK\7600.16385.1
+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360
+set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64;%WDK_ROOT%\lib\Mfc\amd64;%WDK_ROOT%\lib\ATL\amd64
+set OPATH=%PATH%
+set DEV_64=%cd%\..\dep-x64
+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin
 set PERL_512=c:\mozilla-build\perl-5.12-x64\perl
 set PERL_514=c:\mozilla-build\perl-5.14-x64
+echo [Setup] > xchat-wdk.iss
+echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk.iss
+echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk.iss
+del version.exe
+cl /nologo version.c
+version -a >> xchat-wdk.iss
+version -v >> xchat-wdk.iss
+version -i >> xchat-wdk.iss
+version -o >> xchat-wdk.iss
 cd ..
-set DEV_64=%cd%\dep-x64
+build\version -r > resource.h
+echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk.iss
+type build\xchat-wdk.skel.iss >> build\xchat-wdk.iss
 cd src
-echo X64 = YES > makeinc.mak
-echo DEV = %DEV_64% >> makeinc.mak
+echo DEV = %DEV_64% > makeinc.mak
+echo X64 = YES >> makeinc.mak
 type makeinc.skel.mak >> makeinc.mak
-set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64;%WDK_ROOT%\lib\Mfc\amd64;%WDK_ROOT%\lib\ATL\amd64
-set OPATH=%PATH%
-set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin
-cd common
-nmake /nologo /f makefile.mak clean
-cd ..\fe-gtk
-nmake /nologo /f makefile.mak clean
-cd ..\fe-text
 nmake /nologo /f makefile.mak clean
+cd pixmaps
+nmake /nologo /f makefile.mak
 cd ..
 nmake /nologo /f makefile.mak
 cd ..\plugins
@@ -30,5 +41,6 @@ set PATH=%OOPATH%;%PERL_514%\bin
 nmake /nologo /s /f makefile-514.mak clean
 nmake /nologo /s /f makefile-514.mak
 cd ..\..\build
+call compile-po-files.bat
 set PATH=%OPATH%
 call release-x64.bat
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 8cc3a30c..f3aaa30f 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -1,4 +1,6 @@
 @echo off
+set WDK_ROOT=c:\WinDDK\7600.16385.1
+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360
 set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386;%WDK_ROOT%\lib\Mfc\i386;%WDK_ROOT%\lib\ATL\i386
 set OPATH=%PATH%
 set DEV_32=%cd%\..\dep-x86
diff --git a/build/release-x64.bat b/build/release-x64.bat
index 64ad34d9..e6026dfa 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -1,45 +1,65 @@
 @echo off
 set DEPS_ROOT=..\dep-x64
-set XCHAT_DEST=..\tmp
-copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%\xchat.exe.x64
-copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%\xchat-text.exe.x64
-copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%\libgdk_pixbuf-2.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST%\libgio-2.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST%\libglib-2.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST%\libgmodule-2.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST%\libgobject-2.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST%\libpng14-14.dll.x64
-copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%\libgdk-win32-2.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64
-copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.dll.x64
-copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%\libexpat-1.dll.x64
-copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%\libfreetype-6.dll.x64
-copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST%\libpango-1.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST%\libpangocairo-1.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64
-copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64
-copy %DEPS_ROOT%\bin\libxml2.dll %XCHAT_DEST%\libxml2.dll.x64
-copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
-copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64
-copy %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
-copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64
-copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
-copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
-copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64
-copy %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.x64
-copy ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\xcchecksum.dll.x64
-copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
-copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins\xcmpcinfo.dll.x64
-copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins\xcperl-512.dll.x64
-copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins\xcperl-514.dll.x64
-copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64
-copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64
-copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64
-copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\xtray.dll.x64
-copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins\xcwinamp.dll.x64
-copy ..\plugins\wmpa\xcwmpa.dll %XCHAT_DEST%\plugins\xcwmpa.dll.x64
-copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%\lua51.dll.x64
+set XCHAT_DEST=..\dist-x64
+rmdir /q /s %XCHAT_DEST%
+mkdir %XCHAT_DEST%
+echo 2> portable-mode
+move portable-mode %XCHAT_DEST%
+copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
+copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
+xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
+copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
+xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
+xcopy /q /s /i etc %XCHAT_DEST%\etc
+xcopy /q /s /i share %XCHAT_DEST%\share
+copy ..\COPYING %XCHAT_DEST%
+copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST%
+copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST%
+copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.0 %XCHAT_DEST%\LICENSE.GTK
+copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.1 %XCHAT_DEST%\LICENSE.CAIRO
+copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST%
+copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\cert.pem %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST%
+xcopy /q /s /i %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\
+xcopy /q /s /i ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\
+copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
+copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins
+copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins
+copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins
+copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins
+copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins
+copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins
+copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins
+copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins
+copy ..\plugins\wmpa\xcwmpa.dll %XCHAT_DEST%\plugins
+copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%
+xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale
+xcopy /q /s /i %DEPS_ROOT%\share\locale %XCHAT_DEST%\share\locale
diff --git a/build/release-x86.bat b/build/release-x86.bat
index b47d1b2e..aceb525a 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -1,33 +1,36 @@
 @echo off
 set DEPS_ROOT=..\dep-x86
-set XCHAT_DEST=..\tmp
+set XCHAT_DEST=..\dist-x86
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
 echo 2> portable-mode
 move portable-mode %XCHAT_DEST%
 copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
 copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\freetype6.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\intl.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libxml2.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\LICENSE.LIBXML %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
 copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
@@ -36,8 +39,8 @@ xcopy /q /s /i share %XCHAT_DEST%\share
 copy ..\COPYING %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST%
-copy %DEPS_ROOT%\share\doc\glib-2.26.1\COPYING %XCHAT_DEST%\LICENSE.GTK
-copy %DEPS_ROOT%\share\doc\cairo_1.10.2-1_win32\COPYING-LGPL-2.1 %XCHAT_DEST%\LICENSE.CAIRO
+copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.0 %XCHAT_DEST%\LICENSE.GTK
+copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.1 %XCHAT_DEST%\LICENSE.CAIRO
 copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST%