use strawberry perl for 5.14 too and use gendef for def generation

build/build-x64.bat

@@ -4,9 +4,9 @@ set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%
 set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64;%WDK_ROOT%\lib\Mfc\amd64;%WDK_ROOT%\lib\ATL\amd64
 set OPATH=%PATH%
 set DEV_64=%cd%\..\dep-x64
-set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin
+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin;c:\mozilla-build\gendef
 set PERL_512=c:\mozilla-build\perl-5.12-x64\perl
-set PERL_514=c:\mozilla-build\perl-5.14-x64
+set PERL_514=c:\mozilla-build\perl-5.14-x64\perl
 echo [Setup] > xchat-wdk-x64.iss
 echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk-x64.iss
 echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk-x64.iss

build/build-x86.bat

@@ -4,9 +4,9 @@ set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%
 set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386;%WDK_ROOT%\lib\Mfc\i386;%WDK_ROOT%\lib\ATL\i386
 set OPATH=%PATH%
 set DEV_32=%cd%\..\dep-x86
-set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin
+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin;c:\mozilla-build\gendef
 set PERL_512=c:\mozilla-build\perl-5.12-x86\perl
-set PERL_514=c:\mozilla-build\perl-5.14-x86
+set PERL_514=c:\mozilla-build\perl-5.14-x86\perl
 echo [Setup] > xchat-wdk-x86.iss
 echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk-x86.iss
 echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk-x86.iss

build/strawberry-importlib.bat

@@ -1,19 +0,0 @@
-@echo off
-set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
-cd c:\mozilla-build\perl-5.12-x86\perl\lib\CORE
-echo.Overwrite existing def file?
-pause
-dumpbin /exports ..\..\bin\perl512.dll > perl512.def
-echo.Please adjust the resulting file manually, then hit return!
-pause
-lib /machine:x86 /def:perl512.def
-pause
-set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64
-cd c:\mozilla-build\perl-5.12-x64\perl\lib\CORE
-echo.Overwrite existing def file?
-pause
-dumpbin /exports ..\..\bin\perl512.dll > perl512.def
-echo.Please adjust the resulting file manually, then hit return!
-pause
-lib /machine:x64 /def:perl512.def
-pause 

plugins/perl/makefile-512.mak

@@ -14,6 +14,9 @@ perl.def:
 perl.obj: perl.c
 	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL512PATH)\perl\lib\CORE /I.. /DPERL_DLL=\"$(PERL512LIB).dll\"
 
+perl512.def:
+	gendef $(PERL512PATH)\perl\bin\perl512.dll
+
 $(PERL512LIB).lib: perl512.def
 !ifdef X64
 	lib /machine:x64 /def:perl512.def
@@ -32,6 +35,6 @@ $(TARGET): perl.obj perl.def $(PERL512LIB).lib
 clean:
 	@del $(TARGET)
 	@del *.obj
-	@del perl.def
+	@del *.def
 	@del *.lib
 	@del *.exp

plugins/perl/makefile-514.mak

@@ -11,20 +11,32 @@ perl.def:
 	echo xchat_plugin_deinit >> perl.def
 	echo xchat_plugin_get_info >> perl.def
 
+# MSVC only supports __inline, while GCC only supports __inline__. This is defined incorretly
+# in lib\CORE\config.h in Strawberry Perl, see #define PERL_STATIC_INLINE static __inline__
 perl.obj: perl.c
-	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL514PATH)\lib\CORE /I.. /DPERL_DLL=\"$(PERL514LIB).dll\"
+	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL514PATH)\perl\lib\CORE /I.. /DPERL_DLL=\"$(PERL514LIB).dll\" /D__inline__=__inline
+
+perl514.def:
+	gendef $(PERL514PATH)\perl\bin\perl514.dll
+
+$(PERL514LIB).lib: perl514.def
+!ifdef X64
+	lib /machine:x64 /def:perl514.def
+!else
+	lib /machine:x86 /def:perl514.def
+!endif
 
 perl.c: xchat.pm.h
 
 xchat.pm.h: lib/Xchat.pm lib/IRC.pm
 	perl.exe generate_header
 
-$(TARGET): perl.obj perl.def
+$(TARGET): perl.obj perl.def $(PERL514LIB).lib
-	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL514LIB).lib /libpath:$(PERL514PATH)\lib\CORE /delayload:$(PERL514LIB).dll $(DIRENTLIB) delayimp.lib user32.lib shell32.lib advapi32.lib /def:perl.def
+	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL514LIB).lib /delayload:$(PERL514LIB).dll $(DIRENTLIB) delayimp.lib user32.lib shell32.lib advapi32.lib /def:perl.def
 
 clean:
 	@del $(TARGET)
 	@del *.obj
-	@del perl.def
+	@del *.def
 	@del *.lib
 	@del *.exp

plugins/perl/perl.def

@@ -1,4 +0,0 @@
-EXPORTS
-  xchat_plugin_init
-  xchat_plugin_deinit
-  xchat_plugin_get_info