diff options
| -rw-r--r-- | build/release-x64.bat | 12 | ||||
| -rw-r--r-- | build/release-x86.bat | 17 | ||||
| -rw-r--r-- | src/makefile.mak | 8 |
3 files changed, 14 insertions, 23 deletions
diff --git a/build/release-x64.bat b/build/release-x64.bat index df5269c3..47ba3589 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -7,7 +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 ..\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% @@ -22,16 +22,12 @@ 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% +copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libxml2.dll %XCHAT_DEST% xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines %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 @@ -52,7 +48,7 @@ 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\gtkpref\xcgtkpref.dll %XCHAT_DEST%\plugins +::copy ..\plugins\gtkpref\xcgtkpref.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 diff --git a/build/release-x86.bat b/build/release-x86.bat index bf16a3c6..c7223fe0 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -7,13 +7,12 @@ 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 ..\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% -copy %DEPS_ROOT%\bin\libffi-5.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\freetype6.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% @@ -22,17 +21,13 @@ 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\intl.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% +copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libxml2.dll %XCHAT_DEST% xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines %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 @@ -53,7 +48,7 @@ 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\gtkpref\xcgtkpref.dll %XCHAT_DEST%\plugins +::copy ..\plugins\gtkpref\xcgtkpref.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 diff --git a/src/makefile.mak b/src/makefile.mak index cd73b879..6e6cf95c 100644 --- a/src/makefile.mak +++ b/src/makefile.mak @@ -7,8 +7,8 @@ all: @-$(MAKE) /nologo /s /f makefile.mak $@ @cd ..\fe-text @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\gtk2-prefs - @-$(MAKE) /nologo /s /f makefile.mak $@ +# @cd ..\gtk2-prefs +# @-$(MAKE) /nologo /s /f makefile.mak $@ clean: @cd pixmaps @@ -19,5 +19,5 @@ clean: @-$(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 $@ +# @cd ..\gtk2-prefs +# @-$(MAKE) /nologo /s /f makefile.mak clean $@ |