diff --git a/build/build-x64.bat b/build/build-x64.bat index 5c16585c..5f064bba 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -21,6 +21,9 @@ nmake -f makefile.mak cd ..\tcl nmake -f makefile.mak clean nmake -f makefile.mak +cd ..\xdcc +nmake -f makefile.mak clean +nmake -f makefile.mak ::cd ..\xtray ::nmake -f makefile.mak clean ::nmake -f makefile.mak diff --git a/build/build-x86.bat b/build/build-x86.bat index 8e05f21a..b630a6ef 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -21,6 +21,9 @@ nmake -f makefile.mak cd ..\tcl nmake -f makefile.mak clean nmake -f makefile.mak +cd ..\xdcc +nmake -f makefile.mak clean +nmake -f makefile.mak ::cd ..\xtray ::nmake -f makefile.mak clean ::nmake -f makefile.mak diff --git a/build/release-x64.bat b/build/release-x64.bat index 0ed7dec6..1106bb58 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -38,6 +38,7 @@ xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\ +xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\ ::xcopy /S /I ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\po\locale %XCHAT_DEST%\locale xcopy /S /I %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale diff --git a/build/release-x86.bat b/build/release-x86.bat index 60df930c..1221f62c 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -38,6 +38,7 @@ xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\ +xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\ ::xcopy /S /I ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\po\locale %XCHAT_DEST%\locale xcopy /S /I %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale diff --git a/config.h b/config.h index ea5c3932..e3505328 100644 --- a/config.h +++ b/config.h @@ -3,7 +3,7 @@ #define USE_GMODULE #define USE_PLUGIN #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "r1451-3" +#define PACKAGE_VERSION "r1451-4" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL diff --git a/plugins/xdcc/makefile.mak b/plugins/xdcc/makefile.mak new file mode 100644 index 00000000..8b879f09 --- /dev/null +++ b/plugins/xdcc/makefile.mak @@ -0,0 +1,19 @@ +include "..\..\src\makeinc.mak" + +xcxdcc.dll: xdcc.obj xdcc.def + link $(LDFLAGS) $(LIBS) /dll /out:xcxdcc.dll /def:xdcc.def xdcc.obj + dir xcewc.dll + +xdcc.def: + echo EXPORTS > xdcc.def + echo xchat_plugin_init >> xdcc.def + echo xchat_plugin_deinit >> xdcc.def + +xdcc.obj: xdcc.c makefile.mak + cl $(CFLAGS) $(GLIB) /I.. xdcc.c + +clean: + del *.obj + del *.dll + del *.exp + del *.lib diff --git a/xchat-wdk.patch b/xchat-wdk.patch index f5d512c2..91703c51 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -119,6 +119,22 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/p return 0; } FreeLibrary(lib); +diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xdcc/xdcc.c xchat-wdk/plugins/xdcc/xdcc.c +--- xchat-wdk.orig/plugins/xdcc/xdcc.c 2002-12-26 04:35:09 +0100 ++++ xchat-wdk/plugins/xdcc/xdcc.c 2010-08-11 22:49:06 +0200 +@@ -2,11 +2,11 @@ + + #include + #include +-#include + #include + #include + + #include "xchat-plugin.h" ++#include "../../src/common/xchat.h" + + static xchat_plugin *ph; /* plugin handle */ + diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src/common/cfgfiles.c --- xchat-wdk.orig/src/common/cfgfiles.c 2010-08-07 09:14:45 +0200 +++ xchat-wdk/src/common/cfgfiles.c 2010-08-11 02:10:02 +0200