From 103aadaf3fed1ed9693ac8276d4347b01a8bd0ce Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Tue, 5 Oct 2010 23:14:35 +0200 Subject: update xchat environment for new enchant --- build/release-x64.bat | 6 ++---- build/release-x86.bat | 6 ++---- ext/enchant/build-x64.bat | 8 -------- ext/enchant/build-x86.bat | 8 -------- 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 ext/enchant/build-x64.bat delete mode 100644 ext/enchant/build-x86.bat diff --git a/build/release-x64.bat b/build/release-x64.bat index ca29fb4c..7ffaa69e 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -2,8 +2,7 @@ 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 MINGW_BIN=c:\mozilla-build\mingw64\bin -set ENCHANT_BIN=c:\mozilla-build\build\enchant-1.5.0-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 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 @@ -25,14 +24,13 @@ 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 %MINGW_BIN%\libgcc_s_sjlj-1.dll %XCHAT_DEST%\libgcc_s_sjlj-1.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-1.dll %XCHAT_DEST%\libenchant-1.dll.x64 +copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%\libenchant-1.dll.x64 copy %ENCHANT_BIN%\..\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\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64 diff --git a/build/release-x86.bat b/build/release-x86.bat index e7e92954..d0596228 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -2,8 +2,7 @@ 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 MINGW_BIN=c:\mozilla-build\mingw32\bin -set ENCHANT_BIN=c:\mozilla-build\build\enchant-1.5.0-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 rmdir /q /s %XCHAT_DEST% mkdir %XCHAT_DEST% @@ -29,7 +28,6 @@ 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% -copy %MINGW_BIN%\libgcc_s_sjlj-1.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\ @@ -40,7 +38,7 @@ copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST% copy %SSL_BIN%\libeay32.dll %XCHAT_DEST% copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% copy %SSL_BIN%\zlib1.dll %XCHAT_DEST% -copy %ENCHANT_BIN%\libenchant-1.dll %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 ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins diff --git a/ext/enchant/build-x64.bat b/ext/enchant/build-x64.bat deleted file mode 100644 index f198f25f..00000000 --- a/ext/enchant/build-x64.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -set PATH=c:\mozilla-build\mingw64\bin;c:\mozilla-build\msys\bin;c:\mozilla-build\build\xchat-dev64\bin -sh configure --exec-prefix=/usr/enchant-1.5.0-x64 --enable-myspell --enable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek -pause -make -pause -make install -pause diff --git a/ext/enchant/build-x86.bat b/ext/enchant/build-x86.bat deleted file mode 100644 index 5eaeae8f..00000000 --- a/ext/enchant/build-x86.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -set PATH=c:\mozilla-build\mingw32\bin;c:\mozilla-build\msys\bin;c:\mozilla-build\build\xchat-dev32\bin -sh configure --exec-prefix=/usr/enchant-1.5.0-x86 --enable-myspell --enable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek -pause -make -pause -make install -pause -- cgit 1.4.1