LOTS of fixes to the VS solution

3 files changed, 24 insertions, 9 deletions

diff --git a/plugins/perl/perl-512.vcxproj b/plugins/perl/perl-512.vcxproj
index 440496f3..d924af48 100644
--- a/plugins/perl/perl-512.vcxproj
+++ b/plugins/perl/perl-512.vcxproj
@@ -30,6 +30,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <LinkIncremental>false</LinkIncremental>

     <TargetName>$(Perl512Output)</TargetName>

+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>

+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>

   </PropertyGroup>

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

     <ClCompile>

@@ -41,7 +43,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

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

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

-      <AdditionalIncludeDirectories>$(Perl512Path)\perl\lib\CORE;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(Perl512Path)\perl\lib\CORE;$(IntDir);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -55,8 +57,11 @@
     </Link>

     <PreBuildEvent>

       <Command>"$(GendefPath)\gendef" "$(Perl512Path)\perl\bin\$(Perl512Lib).dll"

-lib /nologo /machine:x86 "/def:$(Perl512Lib).def" "/out:$(OutputPath)\$(Perl512Lib).lib"

-"$(Perl512Path)\perl\bin\perl.exe" generate_header</Command>

+move $(Perl512Lib).def "$(IntDir)"

+lib /nologo /machine:x86 "/def:$(IntDir)$(Perl512Lib).def" "/out:$(OutDir)\$(Perl512Lib).lib"

+"$(Perl512Path)\perl\bin\perl.exe" generate_header

+move irc.pm.h "$(IntDir)"

+move xchat.pm.h "$(IntDir)"</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/perl/perl-514.vcxproj b/plugins/perl/perl-514.vcxproj
index 04865562..58cc4f04 100644
--- a/plugins/perl/perl-514.vcxproj
+++ b/plugins/perl/perl-514.vcxproj
@@ -30,6 +30,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <LinkIncremental>false</LinkIncremental>

     <TargetName>$(Perl514Output)</TargetName>

+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>

+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>

   </PropertyGroup>

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

     <ClCompile>

@@ -40,7 +42,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

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

-      <AdditionalIncludeDirectories>$(Perl514Path)\perl\lib\CORE;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(Perl514Path)\perl\lib\CORE;$(IntDir);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

     </ClCompile>

     <Link>

@@ -55,8 +57,11 @@
     </Link>

     <PreBuildEvent>

       <Command>"$(GendefPath)\gendef" "$(Perl514Path)\perl\bin\$(Perl514Lib).dll"

-lib /nologo /machine:x86 "/def:$(Perl514Lib).def" "/out:$(OutputPath)\$(Perl514Lib).lib"

-"$(Perl514Path)\perl\bin\perl.exe" generate_header</Command>

+move $(Perl514Lib).def "$(IntDir)"

+lib /nologo /machine:x86 "/def:$(IntDir)$(Perl514Lib).def" "/out:$(OutDir)\$(Perl514Lib).lib"

+"$(Perl514Path)\perl\bin\perl.exe" generate_header

+move irc.pm.h "$(IntDir)"

+move xchat.pm.h "$(IntDir)"</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/perl/perl-516.vcxproj b/plugins/perl/perl-516.vcxproj
index 5a3c620d..516c1b80 100644
--- a/plugins/perl/perl-516.vcxproj
+++ b/plugins/perl/perl-516.vcxproj
@@ -30,6 +30,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <LinkIncremental>false</LinkIncremental>

     <TargetName>$(Perl516Output)</TargetName>

+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>

+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>

   </PropertyGroup>

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

     <ClCompile>

@@ -40,7 +42,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

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

-      <AdditionalIncludeDirectories>$(Perl516Path)\perl\lib\CORE;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(Perl516Path)\perl\lib\CORE;$(IntDir);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

     </ClCompile>

     <Link>

@@ -55,8 +57,11 @@
     </Link>

     <PreBuildEvent>

       <Command>"$(GendefPath)\gendef" "$(Perl516Path)\perl\bin\$(Perl516Lib).dll"

-lib /nologo /machine:x86 "/def:$(Perl516Lib).def" "/out:$(OutputPath)\$(Perl516Lib).lib"

-"$(Perl516Path)\perl\bin\perl.exe" generate_header</Command>

+move $(Perl516Lib).def "$(IntDir)"

+lib /nologo /machine:x86 "/def:$(IntDir)$(Perl516Lib).def" "/out:$(OutDir)\$(Perl516Lib).lib"

+"$(Perl516Path)\perl\bin\perl.exe" generate_header

+move irc.pm.h "$(IntDir)"

+move xchat.pm.h "$(IntDir)"</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>