From 72794f4fb58bcaa1014b1fdfee4c5bb8b11c13ae Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sat, 2 Oct 2010 22:11:42 +0200 Subject: [PATCH] some cleanup --- build/release-x64.bat | 5 +++-- build/release-x86.bat | 5 +++-- ext/enchant/build-x64.bat | 6 +++++- ext/enchant/build-x86.bat | 6 +++++- src/fe-gtk/makefile.mak | 2 +- src/makeinc.skel | 3 --- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/build/release-x64.bat b/build/release-x64.bat index 7dfb8366..7eaedd25 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -3,6 +3,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\enchant-1-5.0-x86\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 @@ -31,8 +32,8 @@ copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modul 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 %GTK_BIN%\libenchant-1.dll %XCHAT_DEST%\libenchant-1.dll.x64 -copy %GTK_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.x64 +copy %ENCHANT_BIN%\libenchant-1.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 copy ..\plugins\perl\xcperl-58.dll %XCHAT_DEST%\plugins\xcperl-58.dll.x64 diff --git a/build/release-x86.bat b/build/release-x86.bat index 0cedde38..e7bb0115 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -3,6 +3,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\enchant-1-5.0-x86\bin set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni rmdir /q /s %XCHAT_DEST% mkdir %XCHAT_DEST% @@ -39,8 +40,8 @@ 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 %GTK_BIN%\libenchant-1.dll %XCHAT_DEST% -xcopy /q /s /i %GTK_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\ +copy %ENCHANT_BIN%\libenchant-1.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 copy ..\plugins\perl\xcperl-58.dll %XCHAT_DEST%\plugins diff --git a/ext/enchant/build-x64.bat b/ext/enchant/build-x64.bat index bf0777c9..477cdc69 100644 --- a/ext/enchant/build-x64.bat +++ b/ext/enchant/build-x64.bat @@ -1,3 +1,7 @@ @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-x64 --enable-myspell --disable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek +sh configure --exec-prefix=/usr/enchant-1-5.0-x64 --enable-myspell --disable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek +pause +make +pause +make install diff --git a/ext/enchant/build-x86.bat b/ext/enchant/build-x86.bat index 75b99f03..880ac379 100644 --- a/ext/enchant/build-x86.bat +++ b/ext/enchant/build-x86.bat @@ -1,3 +1,7 @@ @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-x86 --enable-myspell --disable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek +sh configure --exec-prefix=/usr/enchant-1-5.0-x86 --enable-myspell --disable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek +pause +make +pause +make install diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak index 4b1f1a21..d83d49d8 100644 --- a/src/fe-gtk/makefile.mak +++ b/src/fe-gtk/makefile.mak @@ -12,7 +12,7 @@ PROG = xchat.exe all: $(PROG) .c.obj: - $(CC) $(CFLAGS) -I..\..\plugins $(GLIB) $(GTK) $(SPELL) $< + $(CC) $(CFLAGS) -I..\..\plugins $(GLIB) $(GTK) $< $(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj $(LINK) /out:$(PROG) /entry:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj diff --git a/src/makeinc.skel b/src/makeinc.skel index e971db6b..8961928b 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -40,9 +40,6 @@ OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x86 CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include LIBS = $(LIBS) /libpath:$(OPENSSLPATH)\lib libeay32.lib ssleay32.lib -SPELL = -I$(DEV32)\include\enchant -LIBS = $(LIBS) libenchant.dll.a - LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj LUAPATH = c:\mozilla-build\build\lua-wdk-5.1.4-2-x86