iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enable x64 Tcl, downgrade to 8.5 and update messages

Browse Source
This commit is contained in:
berkeviktor@aol.com 2010-07-30 21:55:49 +02:00
parent 4d0fba2657
commit 8318988252
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/build-x64.bat
View File

@ -18,9 +18,9 @@ nmake -f makefile.mak
::cd ..\python ::cd ..\python
::nmake -f makefile.mak clean ::nmake -f makefile.mak clean
::nmake -f makefile.mak ::nmake -f makefile.mak
::cd ..\tcl cd ..\tcl
::nmake -f makefile.mak clean nmake -f makefile.mak clean
::nmake -f makefile.mak nmake -f makefile.mak
::cd ..\xtray ::cd ..\xtray
::nmake -f makefile.mak clean ::nmake -f makefile.mak clean
::nmake -f makefile.mak ::nmake -f makefile.mak

4
src/makeinc.mak
View File

@ -22,7 +22,7 @@ LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj
PERLPATH = c:\mozilla-build\perl-5.10-x64\lib\CORE PERLPATH = c:\mozilla-build\perl-5.10-x64\lib\CORE
PYTHONPATH = c:\mozilla-build\python-2.5-x64 PYTHONPATH = c:\mozilla-build\python-2.5-x64
TCLPATH = c:\mozilla-build\tcl-8.6-x64 TCLPATH = c:\mozilla-build\tcl-8.5-x64
!else !else
############################################################# #############################################################
#x86 config #x86 config
@ -34,7 +34,7 @@ LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj
PERLPATH = c:\mozilla-build\perl-5.10-x86\lib\CORE PERLPATH = c:\mozilla-build\perl-5.10-x86\lib\CORE
PYTHONPATH = c:\mozilla-build\python-2.5-x86 PYTHONPATH = c:\mozilla-build\python-2.5-x86
TCLPATH = c:\mozilla-build\tcl-8.6-x86 TCLPATH = c:\mozilla-build\tcl-8.5-x86
MMX = YES MMX = YES
!endif !endif

20
xchat-wdk.patch
View File

@ -1,6 +1,6 @@
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugins/perl/perl.c diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugins/perl/perl.c
--- xchat-wdk.orig/plugins/perl/perl.c 2010-03-23 01:06:59 +0100 --- xchat-wdk.orig/plugins/perl/perl.c 2010-03-23 01:06:59 +0100
+++ xchat-wdk/plugins/perl/perl.c 2010-07-30 21:45:34 +0200 +++ xchat-wdk/plugins/perl/perl.c 2010-07-30 21:54:00 +0200
@@ -16,13 +16,14 @@ @@ -16,13 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
@ -17,7 +17,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
#include <locale.h> #include <locale.h>
#endif #endif
@@ -1340,12 +1341,12 @@ @@ -1340,14 +1341,14 @@
FreeLibrary (lib); FreeLibrary (lib);
lib = NULL; lib = NULL;
thread_mbox ("Cannot open " PERL_DLL "\n\n" thread_mbox ("Cannot open " PERL_DLL "\n\n"
@ -31,8 +31,11 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi
- "You must have ActivePerl 5.8 installed in order to\n" - "You must have ActivePerl 5.8 installed in order to\n"
+ "You must have ActivePerl 5.10 installed in order to\n" + "You must have ActivePerl 5.10 installed in order to\n"
"run perl scripts.\n\n" "run perl scripts.\n\n"
"http://www.activestate.com/ActivePerl/\n\n" - "http://www.activestate.com/ActivePerl/\n\n"
+ "http://www.activestate.com/activeperl/downloads\n\n"
"Make sure perl's bin directory is in your PATH."); "Make sure perl's bin directory is in your PATH.");
}
}
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/plugins/python/python.c diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/plugins/python/python.c
--- xchat-wdk.orig/plugins/python/python.c 2010-05-16 06:31:54 +0200 --- xchat-wdk.orig/plugins/python/python.c 2010-05-16 06:31:54 +0200
+++ xchat-wdk/plugins/python/python.c 2010-07-30 21:45:34 +0200 +++ xchat-wdk/plugins/python/python.c 2010-07-30 21:45:34 +0200
@ -63,7 +66,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/p
#endif #endif
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/plugins/tcl/tclplugin.c diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/plugins/tcl/tclplugin.c
--- xchat-wdk.orig/plugins/tcl/tclplugin.c 2010-03-21 01:49:42 +0100 --- xchat-wdk.orig/plugins/tcl/tclplugin.c 2010-03-21 01:49:42 +0100
+++ xchat-wdk/plugins/tcl/tclplugin.c 2010-07-30 21:45:34 +0200 +++ xchat-wdk/plugins/tcl/tclplugin.c 2010-07-30 21:52:48 +0200
@@ -32,8 +32,6 @@ @@ -32,8 +32,6 @@
#include <windows.h> #include <windows.h>
#define bzero(mem, sz) memset((mem), 0, (sz)) #define bzero(mem, sz) memset((mem), 0, (sz))
@ -73,6 +76,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/p
#endif #endif
#include "xchat-plugin.h" #include "xchat-plugin.h"
@@ -2221,7 +2219,7 @@
#ifdef WIN32
lib = LoadLibraryA(TCL_DLL);
if (!lib) {
- xchat_print(ph, "You must have ActiveTCL installed in order to run Tcl scripts.\n" "http://aspn.activestate.com/ASPN/Tcl/\n" "Make sure Tcl's bin directory is in your PATH.\n\n");
+ xchat_print(ph, "You must have ActiveTCL 8.5 installed in order to run Tcl scripts.\n" "http://www.activestate.com/activetcl/downloads\n" "Make sure Tcl's bin directory is in your PATH.\n\n");
return 0;
}
FreeLibrary(lib);
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src/common/cfgfiles.c 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 2009-01-02 06:56:12 +0100 --- xchat-wdk.orig/src/common/cfgfiles.c 2009-01-02 06:56:12 +0100
+++ xchat-wdk/src/common/cfgfiles.c 2010-07-30 21:45:34 +0200 +++ xchat-wdk/src/common/cfgfiles.c 2010-07-30 21:45:34 +0200