summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--build/build-x64.bat6
-rw-r--r--build/build-x86.bat6
-rw-r--r--build/release-x64.bat1
-rw-r--r--build/release-x86.bat1
-rw-r--r--build/xchat-wdk.skel.iss4
-rw-r--r--plugins/perl/makefile-510.mak30
-rw-r--r--src/makeinc.skel.mak8
7 files changed, 4 insertions, 52 deletions
diff --git a/build/build-x64.bat b/build/build-x64.bat
index 5375809e..29db6400 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -1,6 +1,5 @@
 @echo off
-set PERL_510=c:\mozilla-build\perl-5.10-x64
-set PERL_512=c:\mozilla-build\perl-5.12-x64
+set PERL_512=c:\mozilla-build\perl-5.12-x64\perl
 set PERL_514=c:\mozilla-build\perl-5.14-x64
 cd ..
 set DEV_64=%cd%\dep-x64
@@ -25,9 +24,6 @@ nmake /nologo /f makefile.mak clean
 nmake /nologo /f makefile.mak
 cd perl
 set OOPATH=%PATH%
-set PATH=%OOPATH%;%PERL_510%\bin
-nmake /nologo /s /f makefile-510.mak clean
-nmake /nologo /s /f makefile-510.mak
 set PATH=%OOPATH%;%PERL_512%\bin
 nmake /nologo /s /f makefile-512.mak clean
 nmake /nologo /s /f makefile-512.mak
diff --git a/build/build-x86.bat b/build/build-x86.bat
index b8ee8052..c2df1c25 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -1,6 +1,5 @@
 @echo off
-set PERL_510=c:\mozilla-build\perl-5.10-x86
-set PERL_512=c:\mozilla-build\perl-5.12-x86
+set PERL_512=c:\mozilla-build\perl-5.12-x86\perl
 set PERL_514=c:\mozilla-build\perl-5.14-x86
 echo [Setup] > xchat-wdk.iss
 echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk.iss
@@ -26,9 +25,6 @@ nmake /nologo /f makefile.mak clean
 nmake /nologo /f makefile.mak
 cd perl
 set OOPATH=%PATH%
-set PATH=%OOPATH%;%PERL_510%\bin
-nmake /nologo /s /f makefile-510.mak clean
-nmake /nologo /s /f makefile-510.mak
 set PATH=%OOPATH%;%PERL_512%\bin
 nmake /nologo /s /f makefile-512.mak clean
 nmake /nologo /s /f makefile-512.mak
diff --git a/build/release-x64.bat b/build/release-x64.bat
index 50ae1e64..e22043e9 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -34,7 +34,6 @@ copy %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\lib
 copy ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\xcchecksum.dll.x64
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
 copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins\xcmpcinfo.dll.x64
-copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins\xcperl-510.dll.x64
 copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins\xcperl-512.dll.x64
 copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins\xcperl-514.dll.x64
 copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64
diff --git a/build/release-x86.bat b/build/release-x86.bat
index 05ad7df5..b61bdbea 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -46,7 +46,6 @@ xcopy /q /s /i %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\e
 xcopy /q /s /i ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
 copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins
-copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins
 copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins
diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss
index 31617542..f0c0c8ad 100644
--- a/build/xchat-wdk.skel.iss
+++ b/build/xchat-wdk.skel.iss
@@ -55,7 +55,6 @@ Name: "langs\tcl"; Description: "Tcl"; Types: full custom; Flags: disablenounins
 Name: x86; Description: "x86"; GroupDescription: "XChat-WDK version:"; Flags: exclusive unchecked

 Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: exclusive; Check: Is64BitInstallMode

 

-Name: perl510; Description: "5.10"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl

 Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl

 Name: perl514; Description: "5.14"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl

 

@@ -223,9 +222,6 @@ Source: "plugins\xctcl.dll.x64"; DestDir: "{app}\plugins"; DestName: "xctcl.dll"
 

 

 

-Source: "plugins\xcperl-510.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl510

-Source: "plugins\xcperl-510.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl510

-

 Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl512

 Source: "plugins\xcperl-512.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl512

 

diff --git a/plugins/perl/makefile-510.mak b/plugins/perl/makefile-510.mak
deleted file mode 100644
index 60f6b2dc..00000000
--- a/plugins/perl/makefile-510.mak
+++ /dev/null
@@ -1,30 +0,0 @@
-include "..\..\src\makeinc.mak"
-
-DIRENTLIB = ..\..\src\common\dirent.lib
-TARGET = $(PERL510OUTPUT)
-
-all: $(TARGET)
-
-perl.def:
-	echo EXPORTS > perl.def
-	echo xchat_plugin_init >> perl.def
-	echo xchat_plugin_deinit >> perl.def
-	echo xchat_plugin_get_info >> perl.def
-
-perl.obj: perl.c
-	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL510PATH) /I.. /DPERL_DLL=\"$(PERL510LIB).dll\"
-
-perl.c: xchat.pm.h
-
-xchat.pm.h: lib/Xchat.pm lib/IRC.pm
-	perl.exe generate_header
-
-$(TARGET): perl.obj perl.def
-	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL510LIB).lib /libpath:$(PERL510PATH) /DELAYLOAD:$(PERL510LIB).dll $(DIRENTLIB) DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
-
-clean:
-	@del $(TARGET)
-	@del *.obj
-	@del perl.def
-	@del *.lib
-	@del *.exp
diff --git a/src/makeinc.skel.mak b/src/makeinc.skel.mak
index f7bbeeb7..5c6beb6f 100644
--- a/src/makeinc.skel.mak
+++ b/src/makeinc.skel.mak
@@ -14,8 +14,6 @@ LIBS = $(LIBS) /libpath:$(DEV)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.l
 LUALIB = lua51
 LUAOUTPUT = xclua.dll
 
-PERL510LIB = perl510
-PERL510OUTPUT = xcperl-510.dll
 PERL512LIB = perl512
 PERL512OUTPUT = xcperl-512.dll
 PERL514LIB = perl514
@@ -32,16 +30,14 @@ CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64
 CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64
 LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj
 
-PERL510PATH = c:\mozilla-build\perl-5.10-x64\lib\CORE
-PERL512PATH = c:\mozilla-build\perl-5.12-x64\lib\CORE
+PERL512PATH = c:\mozilla-build\perl-5.12-x64\perl\lib\CORE
 PERL514PATH = c:\mozilla-build\perl-5.14-x64\lib\CORE
 PYTHONPATH = c:\mozilla-build\python-2.7-x64
 TCLPATH = c:\mozilla-build\tcl-8.5-x64
 !else
 LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj
 
-PERL510PATH = c:\mozilla-build\perl-5.10-x86\lib\CORE
-PERL512PATH = c:\mozilla-build\perl-5.12-x86\lib\CORE
+PERL512PATH = c:\mozilla-build\perl-5.12-x86\perl\lib\CORE
 PERL514PATH = c:\mozilla-build\perl-5.14-x86\lib\CORE
 PYTHONPATH = c:\mozilla-build\python-2.7-x86
 TCLPATH = c:\mozilla-build\tcl-8.5-x86