update wdk distribution to use relative paths where possible

9 files changed, 100 insertions, 126 deletions

diff --git a/build/build-x64.bat b/build/build-x64.bat
index ddd49a79..803758f3 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -1,11 +1,15 @@
 @echo off
+set PERL_510=c:\mozilla-build\perl-5.10-x64
+set PERL_512=c:\mozilla-build\perl-5.12-x64
+set DEV_64=c:\mozilla-build\build\xchat-wdk\dep-x64
 cd ..\src
 echo X64 = YES > makeinc.mak
+echo DEV64 = %DEV_64% >> makeinc.mak
 type makeinc.skel >> makeinc.mak
-set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70
-set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64
+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
+set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64
 set OPATH=%PATH%
-set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin
+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
@@ -19,10 +23,10 @@ nmake /nologo /f makefile.mak clean
 nmake /nologo /f makefile.mak
 cd perl
 set OOPATH=%PATH%
-set PATH=%OOPATH%;c:\mozilla-build\perl-5.10-x64\bin
+set PATH=%OOPATH%;%PERL_510%\bin
 nmake /nologo /s /f makefile-510.mak clean
 nmake /nologo /s /f makefile-510.mak
-set PATH=%OOPATH%;c:\mozilla-build\perl-5.12-x64\bin
+set PATH=%OOPATH%;%PERL_512%\bin
 nmake /nologo /s /f makefile-512.mak clean
 nmake /nologo /s /f makefile-512.mak
 cd ..\..\build
diff --git a/build/build-x86.bat b/build/build-x86.bat
index be345934..84345bd5 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -1,10 +1,14 @@
 @echo off
+set PERL_510=c:\mozilla-build\perl-5.10-x86
+set PERL_512=c:\mozilla-build\perl-5.12-x86
+set DEV_32=c:\mozilla-build\build\xchat-wdk\dep-x86
 cd ..\src
-type makeinc.skel > makeinc.mak
-set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70
-set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
+echo DEV32 = %DEV_32% > makeinc.mak
+type makeinc.skel >> makeinc.mak
+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
+set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386
 set OPATH=%PATH%
-set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\build\xchat-dev32\bin
+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin
 nmake /nologo /f makefile.mak clean
 cd pixmaps
 nmake /nologo /f makefile.mak
@@ -15,10 +19,10 @@ nmake /nologo /f makefile.mak clean
 nmake /nologo /f makefile.mak
 cd perl
 set OOPATH=%PATH%
-set PATH=%OOPATH%;c:\mozilla-build\perl-5.10-x86\bin
+set PATH=%OOPATH%;%PERL_510%\bin
 nmake /nologo /s /f makefile-510.mak clean
 nmake /nologo /s /f makefile-510.mak
-set PATH=%OOPATH%;c:\mozilla-build\perl-5.12-x86\bin
+set PATH=%OOPATH%;%PERL_512%\bin
 nmake /nologo /s /f makefile-512.mak clean
 nmake /nologo /s /f makefile-512.mak
 cd ..\..\build
diff --git a/build/build.bat b/build/build.bat
index 6c0982de..2190210a 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -1,6 +1,7 @@
 @echo off
+set WDK_ROOT=c:\WinDDK\7600.16385.1
 call build-x86.bat
 call build-x64.bat
-set PATH=c:\Program Files (x86)\Inno Setup 5
+set PATH=%PROGRAMFILES(X86)%\Inno Setup 5
 compil32 /cc xchat-wdk.iss
 pause
diff --git a/build/dep-extract.bat b/build/dep-extract.bat
new file mode 100644
index 00000000..05e40e02
--- /dev/null
+++ b/build/dep-extract.bat
@@ -0,0 +1,9 @@
+@echo off

+set PATH=%PROGRAMW6432%\7-Zip

+cd ..\dep-x64

+7z x *.zip

+7z x *.7z

+cd ..\dep-x86

+7z x *.zip

+7z x *.7z

+pause

diff --git a/build/deps-x64.txt b/build/deps-x64.txt
deleted file mode 100644
index 1b07ef8c..00000000
--- a/build/deps-x64.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-http://ftp.gnome.org/pub/gnome/binaries/win64/atk/1.32/atk_1.32.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/atk/1.32/atk-dev_1.32.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/cairo_1.10.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/cairo-dev_1.10.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/expat_2.0.1-3_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/fontconfig_2.8.0-2_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/freetype_2.4.2-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime_0.18.1.1-2_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime-dev_0.18.1.1-2_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/libpng_1.4.3-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/gdk-pixbuf/2.22/gdk-pixbuf_2.22.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib_2.26.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib-dev_2.26.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.22/gtk+_2.22.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.22/gtk+-dev_2.22.0-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango_1.28.3-1_win64.zip

-http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango-dev_1.28.3-1_win64.zip

diff --git a/build/deps-x86.txt b/build/deps-x86.txt
deleted file mode 100644
index e11917b5..00000000
--- a/build/deps-x86.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32/atk_1.32.0-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32/atk-dev_1.32.0-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo_1.10.0-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo-dev_1.10.0-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/expat_2.0.1-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/fontconfig_2.8.0-2_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype_2.4.2-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-dev_0.18.1.1-2_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.3-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.5-2_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf_2.22.0-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.0-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.26/glib_2.26.0-2_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.26/glib-dev_2.26.0-2_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/gtk+_2.22.0-2_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/gtk+-dev_2.22.0-2_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango_1.28.3-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango-dev_1.28.3-1_win32.zip

diff --git a/build/release-x64.bat b/build/release-x64.bat
index 5f465402..2c3e1e55 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -1,37 +1,34 @@
 @echo off
-set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin
-set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x64\bin
-set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x64\bin
-set ENCHANT_BIN=c:\mozilla-build\build\enchant-wdk-1.6.0-x64\bin
-set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
+set DEPS_ROOT=..\dep-x64
+set XCHAT_DEST=..\tmp
 copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%\xchat.exe.x64
-copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64
-copy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%\libgdk_pixbuf-2.0-0.dll.x64
-copy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%\libgio-2.0-0.dll.x64
-copy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%\libglib-2.0-0.dll.x64
-copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%\libgmodule-2.0-0.dll.x64
-copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%\libgobject-2.0-0.dll.x64
-copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64
-copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%\libpng14-14.dll.x64
-copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%\libgdk-win32-2.0-0.dll.x64
-copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64
-copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.dll.x64
-copy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%\libexpat-1.dll.x64
-copy %GTK_BIN%\libfreetype-6.dll %XCHAT_DEST%\libfreetype-6.dll.x64
-copy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%\libpango-1.0-0.dll.x64
-copy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%\libpangocairo-1.0-0.dll.x64
-copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64
-copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64
-copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64
-copy %GTK_BIN%\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64
-copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
-copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64
-copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
-copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64
-copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
-copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
-copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64
-copy %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.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%\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\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64
 copy ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\xcchecksum.dll.x64
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
@@ -43,4 +40,4 @@ copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64
 copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\xcxdcc.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 %LUA_BIN%\lua51.dll %XCHAT_DEST%\lua51.dll.x64
+copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%\lua51.dll.x64
diff --git a/build/release-x86.bat b/build/release-x86.bat
index e94e7742..8c234bf1 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -1,51 +1,47 @@
 @echo off
-set GTK_BIN=c:\mozilla-build\build\xchat-dev32\bin
-set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x86\bin
-set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x86\bin
-set ENCHANT_BIN=c:\mozilla-build\build\enchant-wdk-1.6.0-x86\bin
-set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
+set DEPS_ROOT=..\dep-x86
+set XCHAT_DEST=..\tmp
 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 %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
-copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
-copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
-copy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%
-copy %GTK_BIN%\freetype6.dll %XCHAT_DEST%
-copy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
-copy %GTK_BIN%\intl.dll %XCHAT_DEST%
-xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
-copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
-xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
+copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libgdk_pixbuf-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\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%
+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
 copy ..\COPYING %XCHAT_DEST%
-copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
-copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
-copy %GTK_BIN%\..\share\doc\glib-2.26.0\COPYING %XCHAT_DEST%\LICENSE.GTK
-copy %GTK_BIN%\..\share\doc\cairo_1.10.0-1_win32\COPYING-LGPL-2.1 %XCHAT_DEST%\LICENSE.CAIRO
-copy %LUA_BIN%\..\COPYRIGHT %XCHAT_DEST%\LICENSE.LUA
-copy %ENCHANT_BIN%\..\COPYING %XCHAT_DEST%\LICENSE.ENCHANT
-copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
-copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
-copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%
-copy %SSL_BIN%\cert.pem %XCHAT_DEST%
-copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%
-xcopy /q /s /i %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\
-::xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
+copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST%
+copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST%
+copy %DEPS_ROOT%\share\doc\glib-2.26.0\COPYING %XCHAT_DEST%\LICENSE.GTK
+copy %DEPS_ROOT%\share\doc\cairo_1.10.0-1_win32\COPYING-LGPL-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\perl\xcperl-510.dll %XCHAT_DEST%\plugins
@@ -56,7 +52,7 @@ copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins
 copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins
 copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins
 copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins
-copy %LUA_BIN%\lua51.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%
 xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale
-xcopy /q /s /i %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
-xcopy /q /s /i ..\..\myspell %XCHAT_DEST%\share\myspell
+xcopy /q /s /i %DEPS_ROOT%\share\locale %XCHAT_DEST%\share\locale
+xcopy /q /s /i ..\dep-x86\myspell %XCHAT_DEST%\share\myspell
diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss
index 1eda5452..b7fc0a81 100644
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.iss
@@ -19,7 +19,7 @@ DefaultDirName={pf}\XChat-WDK
 DefaultGroupName=XChat-WDK

 DisableProgramGroupPage=yes

 SolidCompression=yes

-SourceDir=..\..\xchat-wdk-uni

+SourceDir=..\tmp

 OutputDir=..\xchat-wdk\build

 FlatComponentsList=no

 PrivilegesRequired=none