5 files changed, 19 insertions, 15 deletions
diff --git a/build/build-x64.bat b/build/build-x64.bat
index 49583c7a..97ec4712 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -25,9 +25,6 @@ echo DEV = %DEV_64% > makeinc.mak
 echo X64 = YES >> makeinc.mak
 type makeinc.skel.mak >> makeinc.mak
 nmake /nologo /f makefile.mak clean
-cd pixmaps
-nmake /nologo /f makefile.mak
-cd ..
 nmake /nologo /f makefile.mak
 cd ..\plugins
 nmake /nologo /f makefile.mak clean
@@ -44,3 +41,4 @@ cd ..\..\build
 call compile-po-files.bat
 set PATH=%OPATH%
 call release-x64.bat
+pause
diff --git a/build/build-x86.bat b/build/build-x86.bat
index f3aaa30f..fb811920 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -24,9 +24,6 @@ cd src
 echo DEV = %DEV_32% > makeinc.mak
 type makeinc.skel.mak >> makeinc.mak
 nmake /nologo /f makefile.mak clean
-cd pixmaps
-nmake /nologo /f makefile.mak
-cd ..
 nmake /nologo /f makefile.mak
 cd ..\plugins
 nmake /nologo /f makefile.mak clean
@@ -43,3 +40,4 @@ cd ..\..\build
 call compile-po-files.bat
 set PATH=%OPATH%
 call release-x86.bat
+pause
diff --git a/build/release-x64.bat b/build/release-x64.bat
index e6026dfa..44107c7b 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -7,6 +7,7 @@ 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 ..\src\gtk2-prefs\gtk2-prefs.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%
diff --git a/build/release-x86.bat b/build/release-x86.bat
index aceb525a..4233f8d0 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -7,6 +7,7 @@ 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 ..\src\gtk2-prefs\gtk2-prefs.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%
diff --git a/src/makefile.mak b/src/makefile.mak
index 670774ed..cd73b879 100644
--- a/src/makefile.mak
+++ b/src/makefile.mak
@@ -1,17 +1,23 @@
 all:
-	@cd common
+	@cd pixmaps
+	@-$(MAKE) /nologo /s /f makefile.mak $@
+	@cd ..\common
 	@-$(MAKE) /nologo /s /f makefile.mak $@
 	@cd ..\fe-gtk
 	@-$(MAKE) /nologo /s /f makefile.mak $@
 	@cd ..\fe-text
 	@-$(MAKE) /nologo /s /f makefile.mak $@
+	@cd ..\gtk2-prefs
+	@-$(MAKE) /nologo /s /f makefile.mak $@
 
 clean:
-	@del common\*.obj
-	@del common\xchatcommon.lib
-	@del fe-gtk\*.obj
-	@del fe-gtk\xchat.exe
-	@del fe-gtk\xchat.res
-	@del fe-text\*.obj
-	@del fe-text\xchat-text.exe
-	@del pixmaps\*.h
+	@cd pixmaps
+	@-$(MAKE) /nologo /s /f makefile.mak clean $@
+	@cd ..\common
+	@-$(MAKE) /nologo /s /f makefile.mak clean $@
+	@cd ..\fe-gtk
+	@-$(MAKE) /nologo /s /f makefile.mak clean $@
+	@cd ..\fe-text
+	@-$(MAKE) /nologo /s /f makefile.mak clean $@
+	@cd ..\gtk2-prefs
+	@-$(MAKE) /nologo /s /f makefile.mak clean $@