summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--plugins/perl/perl.vcxproj6
-rw-r--r--win32/hexchat.props4
-rw-r--r--win32/installer/hexchat.iss.tt2
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/perl/perl.vcxproj b/plugins/perl/perl.vcxproj
index 9d23ad58..1a76928d 100644
--- a/plugins/perl/perl.vcxproj
+++ b/plugins/perl/perl.vcxproj
@@ -16,7 +16,7 @@
   <PropertyGroup Label="Globals">

     <ProjectGuid>{D90BC3E3-1341-4849-9354-5F40489D39D1}</ProjectGuid>

     <Keyword>Win32Proj</Keyword>

-    <RootNamespace>perl518</RootNamespace>

+    <RootNamespace>perl520</RootNamespace>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -61,7 +61,7 @@
       </PrecompiledHeader>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

     </ClCompile>

@@ -90,7 +90,7 @@ move hexchat.pm.h "$(IntDir)"</Command>
       </PrecompiledHeader>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

     </ClCompile>

diff --git a/win32/hexchat.props b/win32/hexchat.props
index 895f65b5..74beb6ff 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -9,7 +9,7 @@
 		<YourDepsPath>c:\mozilla-build\hexchat\gtk</YourDepsPath>

 		<YourGendefPath>c:\mozilla-build\gendef</YourGendefPath>

 		<YourMsgfmtPath>c:\mozilla-build\msgfmt</YourMsgfmtPath>

-		<YourPerlPath>c:\mozilla-build\perl-5.18</YourPerlPath>

+		<YourPerlPath>c:\mozilla-build\perl-5.20</YourPerlPath>

 		<YourPython2Path>c:\mozilla-build\python-2.7</YourPython2Path>

 		<YourPython3Path>c:\mozilla-build\python-3.4</YourPython3Path>

 

@@ -22,7 +22,7 @@
 		<GendefPath>$(YourGendefPath)</GendefPath>

 		<MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>

 		<PerlPath>$(YourPerlPath)\$(PlatformName)</PerlPath>

-		<PerlLib>perl518</PerlLib>

+		<PerlLib>perl520</PerlLib>

 		<PerlOutput>hcperl</PerlOutput>

 		<Python2Path>$(YourPython2Path)\$(PlatformName)</Python2Path>

 		<Python2Lib>python27</Python2Lib>

diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt
index 884e9cab..ba68c3bc 100644
--- a/win32/installer/hexchat.iss.tt
+++ b/win32/installer/hexchat.iss.tt
@@ -273,7 +273,7 @@ begin
 		if IsComponentSelected('spell') and not CheckSpellInstall() then
 			idpAddFile(SPELL, ExpandConstant('{tmp}\spelling-dicts.exe'));
 			
-		if IsComponentSelected('langs\perl') and not CheckDLL('perl518.dll') then
+		if IsComponentSelected('langs\perl') and not CheckDLL('perl520.dll') then
 			idpAddFile(PERL, ExpandConstant('{tmp}\perl.exe'));
 			
 		if IsComponentSelected('langs\python\python2') and not CheckDLL('python27.dll') then