diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/glibconfig-x64.h | 225 | ||||
| -rw-r--r-- | build/release-x64.bat | 18 | ||||
| -rw-r--r-- | build/release-x86.bat | 22 | ||||
| -rw-r--r-- | build/xchat-wdk-x64.skel.iss | 38 | ||||
| -rw-r--r-- | build/xchat-wdk-x86.skel.iss | 36 |
5 files changed, 308 insertions, 31 deletions
diff --git a/build/glibconfig-x64.h b/build/glibconfig-x64.h new file mode 100644 index 00000000..84a6e22b --- /dev/null +++ b/build/glibconfig-x64.h @@ -0,0 +1,225 @@ +/* glibconfig.h + * + * This is a generated file. Please modify 'configure.ac' + */ + +#ifndef __G_LIBCONFIG_H__ +#define __G_LIBCONFIG_H__ + +#include <glib/gmacros.h> + +#include <limits.h> +#include <float.h> + +G_BEGIN_DECLS + +#define G_MINFLOAT FLT_MIN +#define G_MAXFLOAT FLT_MAX +#define G_MINDOUBLE DBL_MIN +#define G_MAXDOUBLE DBL_MAX +#define G_MINSHORT SHRT_MIN +#define G_MAXSHORT SHRT_MAX +#define G_MAXUSHORT USHRT_MAX +#define G_MININT INT_MIN +#define G_MAXINT INT_MAX +#define G_MAXUINT UINT_MAX +#define G_MINLONG LONG_MIN +#define G_MAXLONG LONG_MAX +#define G_MAXULONG ULONG_MAX + +typedef signed char gint8; +typedef unsigned char guint8; +typedef signed short gint16; +typedef unsigned short guint16; +#define G_GINT16_MODIFIER "h" +#define G_GINT16_FORMAT "hi" +#define G_GUINT16_FORMAT "hu" +typedef signed int gint32; +typedef unsigned int guint32; +#define G_GINT32_MODIFIER "" +#define G_GINT32_FORMAT "i" +#define G_GUINT32_FORMAT "u" +#define G_HAVE_GINT64 1 /* deprecated, always true */ + +G_GNUC_EXTENSION typedef signed long long gint64; +G_GNUC_EXTENSION typedef unsigned long long guint64; + +#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL)) +#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL)) +#define G_GINT64_MODIFIER "I64" +#define G_GINT64_FORMAT "I64i" +#define G_GUINT64_FORMAT "I64u" + +#define GLIB_SIZEOF_VOID_P 8 +#define GLIB_SIZEOF_LONG 4 +#define GLIB_SIZEOF_SIZE_T 8 + +typedef signed long long gssize; +typedef unsigned long long gsize; +#define G_GSIZE_MODIFIER "I64" +#define G_GSSIZE_FORMAT "I64i" +#define G_GSIZE_FORMAT "I64u" + +#define G_MAXSIZE G_MAXUINT64 +#define G_MINSSIZE G_MININT64 +#define G_MAXSSIZE G_MAXINT64 + +typedef gint64 goffset; +#define G_MINOFFSET G_MININT64 +#define G_MAXOFFSET G_MAXINT64 + +#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER +#define G_GOFFSET_FORMAT G_GINT64_FORMAT +#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) + + +#define GPOINTER_TO_INT(p) ((gint) (gint64) (p)) +#define GPOINTER_TO_UINT(p) ((guint) (guint64) (p)) + +#define GINT_TO_POINTER(i) ((gpointer) (gint64) (i)) +#define GUINT_TO_POINTER(u) ((gpointer) (guint64) (u)) + +typedef signed long long gintptr; +typedef unsigned long long guintptr; + +#define G_GINTPTR_MODIFIER "I64" +#define G_GINTPTR_FORMAT "I64i" +#define G_GUINTPTR_FORMAT "I64u" + +#ifdef NeXT /* @#%@! NeXTStep */ +# define g_ATEXIT(proc) (!atexit (proc)) +#else +# define g_ATEXIT(proc) (atexit (proc)) +#endif + +#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END + +#define GLIB_MAJOR_VERSION 2 +#define GLIB_MINOR_VERSION 30 +#define GLIB_MICRO_VERSION 2 + +#define G_OS_WIN32 +#define G_PLATFORM_WIN32 + + +#define G_VA_COPY va_copy + +#ifdef __cplusplus +#define G_HAVE_INLINE 1 +#else /* !__cplusplus */ +#ifndef _MSC_VER +#define G_HAVE_INLINE 1 +#endif /* _MSC_VER */ +#define G_HAVE___INLINE 1 +#if !defined(_MSC_VER) && !defined(__DMC__) +#define G_HAVE___INLINE__ 1 +#endif /* !_MSC_VER and !__DMC__ */ +#endif /* !__cplusplus */ + +#ifdef __cplusplus +#define G_CAN_INLINE 1 +#else /* !__cplusplus */ +#define G_CAN_INLINE 1 +#endif + +#ifndef __cplusplus +# define G_HAVE_ISO_VARARGS 1 +#endif + +/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi + * is passed ISO vararg support is turned off, and there is no work + * around to turn it on, so we unconditionally turn it off. + */ +#if __GNUC__ == 2 && __GNUC_MINOR__ == 95 +# undef G_HAVE_ISO_VARARGS +#endif + +#define G_HAVE_GNUC_VARARGS 1 +#define G_HAVE_GROWING_STACK 0 + +#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) +#define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) +#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) +#define G_GNUC_INTERNAL __hidden +#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY) +#define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) +#else +#define G_GNUC_INTERNAL +#endif + +#define G_THREADS_ENABLED +#define G_THREADS_IMPL_WIN32 +typedef struct _GMutex* GStaticMutex; +#define G_STATIC_MUTEX_INIT NULL +#define g_static_mutex_get_mutex(mutex) \ + (g_static_mutex_get_mutex_impl_shortcut (mutex)) +/* This represents a system thread as used by the implementation. An + * alien implementaion, as loaded by g_thread_init can only count on + * "sizeof (gpointer)" bytes to store their info. We however need more + * for some of our native implementations. */ +typedef union _GSystemThread GSystemThread; +union _GSystemThread +{ + char data[8]; + double dummy_double; + void *dummy_pointer; + long dummy_long; +}; + +#define G_ATOMIC_OP_USE_GCC_BUILTINS 1 + +#define GINT16_TO_LE(val) ((gint16) (val)) +#define GUINT16_TO_LE(val) ((guint16) (val)) +#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val)) +#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val)) +#define GINT32_TO_LE(val) ((gint32) (val)) +#define GUINT32_TO_LE(val) ((guint32) (val)) +#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val)) +#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val)) +#define GINT64_TO_LE(val) ((gint64) (val)) +#define GUINT64_TO_LE(val) ((guint64) (val)) +#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val)) +#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val)) +#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val)) +#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val)) +#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val)) +#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val)) +#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val)) +#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val)) +#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val)) +#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val)) +#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val)) +#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val)) +#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val)) +#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val)) +#define G_BYTE_ORDER G_LITTLE_ENDIAN + +#define GLIB_SYSDEF_POLLIN =1 +#define GLIB_SYSDEF_POLLOUT =4 +#define GLIB_SYSDEF_POLLPRI =2 +#define GLIB_SYSDEF_POLLHUP =16 +#define GLIB_SYSDEF_POLLERR =8 +#define GLIB_SYSDEF_POLLNVAL =32 + +#define G_MODULE_SUFFIX "dll" + +/* A GPid is an abstraction for a process "handle". It is *not* an + * abstraction for a process identifier in general. GPid is used in + * GLib only for descendant processes spawned with the g_spawn* + * functions. On POSIX there is no "process handle" concept as such, + * but on Windows a GPid is a handle to a process, a kind of pointer, + * not a process identifier. + */ +typedef void * GPid; + +#define GLIB_SYSDEF_AF_UNIX 1 +#define GLIB_SYSDEF_AF_INET 2 +#define GLIB_SYSDEF_AF_INET6 23 + +#define GLIB_SYSDEF_MSG_OOB 1 +#define GLIB_SYSDEF_MSG_PEEK 2 +#define GLIB_SYSDEF_MSG_DONTROUTE 4 + +G_END_DECLS + +#endif /* GLIBCONFIG_H */ diff --git a/build/release-x64.bat b/build/release-x64.bat index 871fef80..4f60f256 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -7,10 +7,11 @@ 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\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% @@ -22,16 +23,21 @@ 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\libpng14-14.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libxml2.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% 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 xcopy /q /s /i share %XCHAT_DEST%\share +xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes copy ..\COPYING %XCHAT_DEST% copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST% copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST% @@ -39,7 +45,7 @@ copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.0 %XCHAT_DEST%\LICENSE.GTK copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.1 %XCHAT_DEST%\LICENSE.CAIRO copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST% copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.LIBXML %XCHAT_DEST% +copy %DEPS_ROOT%\share\doc\libxml2-2.7.8\Copyright %XCHAT_DEST%\LICENSE.LIBXML copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST% copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST% copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST% @@ -51,7 +57,7 @@ copy ..\plugins\doat\xcdoat.dll %XCHAT_DEST%\plugins copy ..\plugins\exec\xcexec.dll %XCHAT_DEST%\plugins copy ..\plugins\fishlim\xcfishlim.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 @@ -60,7 +66,7 @@ copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins -copy ..\plugins\winsys\xcwinsys.dll %XCHAT_DEST%\plugins +::copy ..\plugins\winsys\xcwinsys.dll %XCHAT_DEST%\plugins copy ..\plugins\wmpa\xcwmpa.dll %XCHAT_DEST%\plugins copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST% xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale diff --git a/build/release-x86.bat b/build/release-x86.bat index d6d8589b..39d8ca01 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -7,12 +7,13 @@ 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\freetype6.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libfreetype-6.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% @@ -21,17 +22,22 @@ 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\intl.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\libpng14-14.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libxml2.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% 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 xcopy /q /s /i share %XCHAT_DEST%\share +xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes copy ..\COPYING %XCHAT_DEST% copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST% copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST% @@ -39,7 +45,7 @@ copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.0 %XCHAT_DEST%\LICENSE.GTK copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.1 %XCHAT_DEST%\LICENSE.CAIRO copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST% copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.LIBXML %XCHAT_DEST% +copy %DEPS_ROOT%\share\doc\libxml2-2.7.8\Copyright %XCHAT_DEST%\LICENSE.LIBXML copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST% copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST% copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST% @@ -51,7 +57,7 @@ copy ..\plugins\doat\xcdoat.dll %XCHAT_DEST%\plugins copy ..\plugins\exec\xcexec.dll %XCHAT_DEST%\plugins copy ..\plugins\fishlim\xcfishlim.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 @@ -60,7 +66,7 @@ copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins -copy ..\plugins\winsys\xcwinsys.dll %XCHAT_DEST%\plugins +::copy ..\plugins\winsys\xcwinsys.dll %XCHAT_DEST%\plugins copy ..\plugins\wmpa\xcwmpa.dll %XCHAT_DEST%\plugins copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST% xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale diff --git a/build/xchat-wdk-x64.skel.iss b/build/xchat-wdk-x64.skel.iss index ff325d79..e4bcde9f 100644 --- a/build/xchat-wdk-x64.skel.iss +++ b/build/xchat-wdk-x64.skel.iss @@ -31,6 +31,7 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning +Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning ;Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins"; Description: "Plugins"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\checksum"; Description: "Checksum"; Types: full custom; Flags: disablenouninstallwarning @@ -40,7 +41,7 @@ Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: full custom; Flags: disa Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disablenouninstallwarning -Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning +;Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\xtray"; Description: "X-Tray"; Types: full custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning @@ -73,7 +74,7 @@ Source: ISSkinU.dll; DestDir: {app}; Flags: dontcopy ; Add the Visual Style resource contains resources used for skinning, ; you can also use Microsoft Visual Styles (*.msstyles) resources. -Source: watercolorlite-blue.cjstyles; DestDir: {tmp}; Flags: dontcopy +Source: watercolorlite-green.cjstyles; DestDir: {tmp}; Flags: dontcopy Source: "portable-mode"; DestDir: "{app}"; Tasks: portable @@ -86,19 +87,20 @@ Source: "LICENSE.CAIRO"; DestDir: "{app}"; Components: libs Source: "LICENSE.LUA"; DestDir: "{app}"; Components: libs Source: "LICENSE.ENCHANT"; DestDir: "{app}"; Components: libs Source: "LICENSE.LIBXML"; DestDir: "{app}"; Components: libs -Source: "etc\*"; DestDir: "{app}\etc"; Flags: createallsubdirs recursesubdirs; Components: libs +;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Components: libs and not gtkengines +Source: "etc\download.png"; DestDir: "{app}\etc"; Components: libs +Source: "etc\music.png"; DestDir: "{app}\etc"; Components: libs Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: createallsubdirs recursesubdirs; Components: libs Source: "locale\*"; DestDir: "{app}\locale"; 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: spelling -Source: "libfreetype-6.dll"; DestDir: "{app}"; Components: libs -Source: "libintl-8.dll"; DestDir: "{app}"; Components: libs - Source: "libatk-1.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libcairo-2.dll"; DestDir: "{app}"; Components: libs Source: "libeay32.dll"; DestDir: "{app}"; Components: libs Source: "libexpat-1.dll"; DestDir: "{app}"; Components: libs +Source: "libffi-5.dll"; DestDir: "{app}"; Components: libs +Source: "libfreetype-6.dll"; DestDir: "{app}"; Components: libs Source: "libfontconfig-1.dll"; DestDir: "{app}"; Components: libs Source: "libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libgdk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs @@ -108,15 +110,20 @@ Source: "libgmodule-2.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libgtk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs +Source: "libintl-8.dll"; DestDir: "{app}"; Components: libs +Source: "libjasper-1.dll"; DestDir: "{app}"; Components: libs +Source: "libjpeg-8.dll"; DestDir: "{app}"; Components: libs Source: "libpango-1.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libpangocairo-1.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libpangoft2-1.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libpangowin32-1.0-0.dll"; DestDir: "{app}"; Components: libs -Source: "libpng14-14.dll"; DestDir: "{app}"; Components: libs +Source: "libpixman-1-0.dll"; DestDir: "{app}"; Components: libs +Source: "libtiff-3.dll"; DestDir: "{app}"; Components: libs +Source: "libpng15-15.dll"; DestDir: "{app}"; Components: libs Source: "lua51.dll"; DestDir: "{app}"; Components: libs Source: "ssleay32.dll"; DestDir: "{app}"; Components: libs Source: "zlib1.dll"; DestDir: "{app}"; Components: libs -Source: "libxml2.dll"; DestDir: "{app}"; Components: libs +Source: "libxml2-2.dll"; DestDir: "{app}"; Components: libs Source: "libenchant.dll"; DestDir: "{app}"; Components: libs Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: libs @@ -125,6 +132,19 @@ Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\ Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; Components: libs +Source: "etc\gtkpref.png"; DestDir: "{app}\etc"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libcrux-engine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libglide.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libhcengine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libindustrial.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libmist.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libredmond95.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libthinice.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "plugins\xcgtkpref.dll"; DestDir: "{app}\plugins"; Components: gtkengines +Source: "share\themes\*"; DestDir: "{app}\share\themes"; Flags: createallsubdirs recursesubdirs; Components: gtkengines +Source: "gtk2-prefs.exe"; DestDir: "{app}"; Components: gtkengines + Source: "plugins\xcchecksum.dll"; DestDir: "{app}\plugins"; Components: plugins\checksum Source: "plugins\xcdoat.dll"; DestDir: "{app}\plugins"; Components: plugins\doat Source: "plugins\xcexec.dll"; DestDir: "{app}\plugins"; Components: plugins\exec @@ -132,7 +152,7 @@ Source: "plugins\xcfishlim.dll"; DestDir: "{app}\plugins"; Components: plugins\f Source: "plugins\xcmpcinfo.dll"; DestDir: "{app}\plugins"; Components: plugins\mpcinfo Source: "plugins\xcupd.dll"; DestDir: "{app}\plugins"; Components: plugins\upd Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Components: plugins\winamp -Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Components: plugins\winsys +;Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Components: plugins\winsys Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: plugins\xtray Source: "plugins\xcwmpa.dll"; DestDir: "{app}\plugins"; Components: plugins\wmpa diff --git a/build/xchat-wdk-x86.skel.iss b/build/xchat-wdk-x86.skel.iss index 8a99ebfe..1b68b426 100644 --- a/build/xchat-wdk-x86.skel.iss +++ b/build/xchat-wdk-x86.skel.iss @@ -30,6 +30,7 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning +Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning ;Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins"; Description: "Plugins"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\checksum"; Description: "Checksum"; Types: full custom; Flags: disablenouninstallwarning @@ -39,7 +40,7 @@ Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: full custom; Flags: disa Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disablenouninstallwarning -Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning +;Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\xtray"; Description: "X-Tray"; Types: full custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning @@ -85,19 +86,20 @@ Source: "LICENSE.CAIRO"; DestDir: "{app}"; Components: libs Source: "LICENSE.LUA"; DestDir: "{app}"; Components: libs Source: "LICENSE.ENCHANT"; DestDir: "{app}"; Components: libs Source: "LICENSE.LIBXML"; DestDir: "{app}"; Components: libs -Source: "etc\*"; DestDir: "{app}\etc"; Flags: createallsubdirs recursesubdirs; Components: libs +;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Components: libs and not gtkengines +Source: "etc\download.png"; DestDir: "{app}\etc"; Components: libs +Source: "etc\music.png"; DestDir: "{app}\etc"; Components: libs Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: createallsubdirs recursesubdirs; Components: libs Source: "locale\*"; DestDir: "{app}\locale"; 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: spelling -Source: "freetype6.dll"; DestDir: "{app}"; Components: libs -Source: "intl.dll"; DestDir: "{app}"; Components: libs - Source: "libatk-1.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libcairo-2.dll"; DestDir: "{app}"; Components: libs Source: "libeay32.dll"; DestDir: "{app}"; Components: libs Source: "libexpat-1.dll"; DestDir: "{app}"; Components: libs +Source: "libffi-5.dll"; DestDir: "{app}"; Components: libs +Source: "libfreetype-6.dll"; DestDir: "{app}"; Components: libs Source: "libfontconfig-1.dll"; DestDir: "{app}"; Components: libs Source: "libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libgdk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs @@ -107,15 +109,20 @@ Source: "libgmodule-2.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libgtk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs +Source: "libintl-8.dll"; DestDir: "{app}"; Components: libs +Source: "libjasper-1.dll"; DestDir: "{app}"; Components: libs +Source: "libjpeg-8.dll"; DestDir: "{app}"; Components: libs Source: "libpango-1.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libpangocairo-1.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libpangoft2-1.0-0.dll"; DestDir: "{app}"; Components: libs Source: "libpangowin32-1.0-0.dll"; DestDir: "{app}"; Components: libs -Source: "libpng14-14.dll"; DestDir: "{app}"; Components: libs +Source: "libpixman-1-0.dll"; DestDir: "{app}"; Components: libs +Source: "libtiff-3.dll"; DestDir: "{app}"; Components: libs +Source: "libpng15-15.dll"; DestDir: "{app}"; Components: libs Source: "lua51.dll"; DestDir: "{app}"; Components: libs Source: "ssleay32.dll"; DestDir: "{app}"; Components: libs Source: "zlib1.dll"; DestDir: "{app}"; Components: libs -Source: "libxml2.dll"; DestDir: "{app}"; Components: libs +Source: "libxml2-2.dll"; DestDir: "{app}"; Components: libs Source: "libenchant.dll"; DestDir: "{app}"; Components: libs Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: libs @@ -124,6 +131,19 @@ Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\ Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; Components: libs +Source: "etc\gtkpref.png"; DestDir: "{app}\etc"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libcrux-engine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libglide.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libhcengine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libindustrial.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libmist.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libredmond95.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "lib\gtk-2.0\2.10.0\engines\libthinice.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines +Source: "plugins\xcgtkpref.dll"; DestDir: "{app}\plugins"; Components: gtkengines +Source: "share\themes\*"; DestDir: "{app}\share\themes"; Flags: createallsubdirs recursesubdirs; Components: gtkengines +Source: "gtk2-prefs.exe"; DestDir: "{app}"; Components: gtkengines + Source: "plugins\xcchecksum.dll"; DestDir: "{app}\plugins"; Components: plugins\checksum Source: "plugins\xcdoat.dll"; DestDir: "{app}\plugins"; Components: plugins\doat Source: "plugins\xcexec.dll"; DestDir: "{app}\plugins"; Components: plugins\exec @@ -131,7 +151,7 @@ Source: "plugins\xcfishlim.dll"; DestDir: "{app}\plugins"; Components: plugins\f Source: "plugins\xcmpcinfo.dll"; DestDir: "{app}\plugins"; Components: plugins\mpcinfo Source: "plugins\xcupd.dll"; DestDir: "{app}\plugins"; Components: plugins\upd Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Components: plugins\winamp -Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Components: plugins\winsys +;Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Components: plugins\winsys Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: plugins\xtray Source: "plugins\xcwmpa.dll"; DestDir: "{app}\plugins"; Components: plugins\wmpa |