diff options
| -rw-r--r-- | build/release-x86.bat | 1 | ||||
| -rw-r--r-- | build/xchat-wdk.iss | 4 | ||||
| -rw-r--r-- | config.h | 6 | ||||
| -rw-r--r-- | src/makeinc.skel | 6 | ||||
| -rw-r--r-- | xchat-wdk.patch | 17 |
5 files changed, 26 insertions, 8 deletions
diff --git a/build/release-x86.bat b/build/release-x86.bat index 61a0282c..e439e952 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -50,3 +50,4 @@ copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins copy %LUA_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 diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index cfa608c6..2772af1c 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -37,6 +37,7 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom [Components] Name: "libs"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed Name: "translations"; Description: "Translations"; Types: normal full custom +Name: "dictionaries"; Description: "Spelling dictionaries"; Types: full custom Name: "plugins"; Description: "Plugins"; Types: full custom Name: "plugins\ewc"; Description: "EasyWinampControl"; Types: full custom Name: "plugins\upd"; Description: "XChat-WDK Update Checker"; Types: normal full custom @@ -68,7 +69,8 @@ Source: "LICENSE.ZLIB"; DestDir: "{app}"; Components: libs Source: "portable-mode"; DestDir: "{app}"; Tasks: portable Source: "etc\*"; DestDir: "{app}\etc"; Flags: createallsubdirs recursesubdirs; Components: libs Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubdirs; Components: translations -Source: "share\*"; DestDir: "{app}\share"; Flags: createallsubdirs recursesubdirs; Components: translations +Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: createallsubdirs recursesubdirs; Components: translations +Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: createallsubdirs recursesubdirs; Components: dictionaries diff --git a/config.h b/config.h index d4c95c6a..1d0b0e88 100644 --- a/config.h +++ b/config.h @@ -2,9 +2,9 @@ #define ENABLE_NLS #define USE_GMODULE #define USE_PLUGIN -/*#ifndef _WIN64 -#define USE_GTKSPELL -#endif*/ +#ifndef _WIN64 +#define USE_LIBSEXY +#endif #define PACKAGE_NAME "xchat" #define PACKAGE_VERSION "1468" #define XCHATLIBDIR "." diff --git a/src/makeinc.skel b/src/makeinc.skel index 8da71b38..e971db6b 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -40,8 +40,8 @@ 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 = -Ic:\mozilla-build\build\gtkspell-x86\include\gtkspell-2.0 -#LIBS = $(LIBS) /libpath:c:\mozilla-build\build\gtkspell-x86\lib libgtkspell.a +SPELL = -I$(DEV32)\include\enchant +LIBS = $(LIBS) libenchant.dll.a LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj @@ -111,7 +111,7 @@ rawlog.obj \ search.obj \ servlistgui.obj \ setup.obj \ -#sexy-spell-entry.obj \ +sexy-spell-entry.obj \ textgui.obj \ urlgrab.obj \ userlistgui.obj \ diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 16963717..0f068634 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -1296,7 +1296,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat-wdk/src/fe-gtk/sexy-spell-entry.c --- xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c 2006-07-17 05:51:02 +0000 -+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-09-28 14:38:39 +0000 ++++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-10-01 16:19:55 +0000 @@ -31,6 +31,20 @@ /*#include "gtkspell-iso-codes.h" #include "sexy-marshal.h"*/ @@ -1318,6 +1318,21 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat /* * Bunch of poop to make enchant into a runtime dependency rather than a * compile-time dependency. This makes it so I don't have to hear the +@@ -134,12 +148,10 @@ + GModule *enchant; + gpointer funcptr; + +- enchant = g_module_open("libenchant", 0); ++ enchant = g_module_open("libenchant.dll", 0); + if (enchant == NULL) + { +- enchant = g_module_open("libenchant.so.1", 0); +- if (enchant == NULL) +- return; ++ return; + } + + have_enchant = TRUE; diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe-gtk/xtext.c --- xchat-wdk.orig/src/fe-gtk/xtext.c 2008-08-29 11:24:17 +0000 +++ xchat-wdk/src/fe-gtk/xtext.c 2010-09-29 20:07:37 +0000 |