From c8f8a26c9cfc4e59e8b0a664dc1b3dcc8bf7dd66 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Mon, 1 Apr 2013 23:21:41 +0200 Subject: [PATCH] Add future Perl 5.18 project --- plugins/perl/perl-514.vcxproj | 124 ------------------ plugins/perl/perl-514.vcxproj.filters | 23 ---- .../{perl-512.vcxproj => perl-518.vcxproj} | 44 +++---- ...xproj.filters => perl-518.vcxproj.filters} | 10 +- win32/hexchat.sln | 18 +-- 5 files changed, 32 insertions(+), 187 deletions(-) delete mode 100644 plugins/perl/perl-514.vcxproj delete mode 100644 plugins/perl/perl-514.vcxproj.filters rename plugins/perl/{perl-512.vcxproj => perl-518.vcxproj} (76%) rename plugins/perl/{perl-512.vcxproj.filters => perl-518.vcxproj.filters} (96%) diff --git a/plugins/perl/perl-514.vcxproj b/plugins/perl/perl-514.vcxproj deleted file mode 100644 index 4db6163d..00000000 --- a/plugins/perl/perl-514.vcxproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Release - Win32 - - - Release - x64 - - - - {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} - Win32Proj - perl514 - - - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - - false - $(Perl514Output) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - $(Perl514Output) - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL514_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Perl514Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) - true - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - $(Perl514Lib).lib;%(AdditionalDependencies) - perl.def - $(Perl514Lib).dll;%(DelayLoadDLLs) - - - "$(GendefPath)\gendef" "$(Perl514Path)\perl\bin\$(Perl514Lib).dll" -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)" - - - - - - - MaxSpeed - true - true - WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL514_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(Perl514Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) - true - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - $(Perl514Lib).lib;%(AdditionalDependencies) - perl.def - $(Perl514Lib).dll;%(DelayLoadDLLs) - - - "$(GendefPath)\gendef" "$(Perl514Path)\perl\bin\$(Perl514Lib).dll" -move $(Perl514Lib).def "$(IntDir)" -lib /nologo /machine:x64 "/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)" - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/perl/perl-514.vcxproj.filters b/plugins/perl/perl-514.vcxproj.filters deleted file mode 100644 index c6c78a57..00000000 --- a/plugins/perl/perl-514.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/perl/perl-512.vcxproj b/plugins/perl/perl-518.vcxproj similarity index 76% rename from plugins/perl/perl-512.vcxproj rename to plugins/perl/perl-518.vcxproj index 054b9dbf..1b4cac9f 100644 --- a/plugins/perl/perl-512.vcxproj +++ b/plugins/perl/perl-518.vcxproj @@ -11,9 +11,9 @@ - {987E9374-98A1-44BA-946F-D3472D7A7055} + {D90BC3E3-1341-4849-9354-5F40489D39D1} Win32Proj - perl512 + perl518 @@ -42,13 +42,13 @@ false - $(Perl512Output) + $(Perl518Output) $(HexChatBin) $(HexChatObj)$(ProjectName)\ false - $(Perl512Output) + $(Perl518Output) $(HexChatBin) $(HexChatObj)$(ProjectName)\ @@ -59,9 +59,9 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL512_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) + $(Perl518Path)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) true - $(Perl512Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) Windows @@ -69,15 +69,15 @@ true true $(OutDir);%(AdditionalLibraryDirectories) - $(Perl512Lib).lib;%(AdditionalDependencies) + $(Perl518Lib).lib;%(AdditionalDependencies) perl.def - $(Perl512Lib).dll;%(DelayLoadDLLs) + $(Perl518Lib).dll;%(DelayLoadDLLs) - "$(GendefPath)\gendef" "$(Perl512Path)\perl\bin\$(Perl512Lib).dll" -move $(Perl512Lib).def "$(IntDir)" -lib /nologo /machine:x86 "/def:$(IntDir)$(Perl512Lib).def" "/out:$(OutDir)\$(Perl512Lib).lib" -"$(Perl512Path)\perl\bin\perl.exe" generate_header + "$(GendefPath)\gendef" "$(Perl518Path)\bin\$(Perl518Lib).dll" +move $(Perl518Lib).def "$(IntDir)" +lib /nologo /machine:x86 "/def:$(IntDir)$(Perl518Lib).def" "/out:$(OutDir)\$(Perl518Lib).lib" +"$(Perl518Path)\bin\perl.exe" generate_header move irc.pm.h "$(IntDir)" move xchat.pm.h "$(IntDir)" @@ -89,9 +89,9 @@ move xchat.pm.h "$(IntDir)" MaxSpeed true true - WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL512_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) + WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) + $(Perl518Path)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) true - $(Perl512Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) Windows @@ -99,24 +99,24 @@ move xchat.pm.h "$(IntDir)" true true $(OutDir);%(AdditionalLibraryDirectories) - $(Perl512Lib).lib;%(AdditionalDependencies) + $(Perl518Lib).lib;%(AdditionalDependencies) perl.def - $(Perl512Lib).dll;%(DelayLoadDLLs) + $(Perl518Lib).dll;%(DelayLoadDLLs) - "$(GendefPath)\gendef" "$(Perl512Path)\perl\bin\$(Perl512Lib).dll" -move $(Perl512Lib).def "$(IntDir)" -lib /nologo /machine:x64 "/def:$(IntDir)$(Perl512Lib).def" "/out:$(OutDir)\$(Perl512Lib).lib" -"$(Perl512Path)\perl\bin\perl.exe" generate_header + "$(GendefPath)\gendef" "$(Perl518Path)\bin\$(Perl518Lib).dll" +move $(Perl518Lib).def "$(IntDir)" +lib /nologo /machine:x64 "/def:$(IntDir)$(Perl518Lib).def" "/out:$(OutDir)\$(Perl518Lib).lib" +"$(Perl518Path)\bin\perl.exe" generate_header move irc.pm.h "$(IntDir)" move xchat.pm.h "$(IntDir)" - + - + diff --git a/plugins/perl/perl-512.vcxproj.filters b/plugins/perl/perl-518.vcxproj.filters similarity index 96% rename from plugins/perl/perl-512.vcxproj.filters rename to plugins/perl/perl-518.vcxproj.filters index c6c78a57..f6d00b5c 100644 --- a/plugins/perl/perl-512.vcxproj.filters +++ b/plugins/perl/perl-518.vcxproj.filters @@ -10,14 +10,14 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - Source Files - - Resource Files + + + Source Files + + \ No newline at end of file diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 5c1576bf..59f97ab3 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -30,13 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripting", "scripting", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{BB051F0F-A841-4A9A-BAF6-51DD9866D65A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-512", "..\plugins\perl\perl-512.vcxproj", "{987E9374-98A1-44BA-946F-D3472D7A7055}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-514", "..\plugins\perl\perl-514.vcxproj", "{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}" - ProjectSection(ProjectDependencies) = postProject - {987E9374-98A1-44BA-946F-D3472D7A7055} = {987E9374-98A1-44BA-946F-D3472D7A7055} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-516", "..\plugins\perl\perl-516.vcxproj", "{58654438-F674-42F7-88FA-73EF90AD80B1}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "..\plugins\python\python.vcxproj", "{19C52A0A-A790-409E-A28A-9745FF990F5C}" @@ -97,6 +90,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "htm", "..\src\htm\htm.cspro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make-te", "..\src\common\make-te.vcxproj", "{A7D7CE59-2A31-48AE-BED2-A9828E241832}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl-518", "..\plugins\perl\perl-518.vcxproj", "{D90BC3E3-1341-4849-9354-5F40489D39D1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Release|Win32 = Release|Win32 @@ -123,10 +118,6 @@ Global {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|Win32.Build.0 = Release|Win32 {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|x64.ActiveCfg = Release|x64 {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|x64.Build.0 = Release|x64 - {987E9374-98A1-44BA-946F-D3472D7A7055}.Release|Win32.ActiveCfg = Release|Win32 - {987E9374-98A1-44BA-946F-D3472D7A7055}.Release|x64.ActiveCfg = Release|x64 - {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}.Release|Win32.ActiveCfg = Release|Win32 - {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}.Release|x64.ActiveCfg = Release|x64 {58654438-F674-42F7-88FA-73EF90AD80B1}.Release|Win32.ActiveCfg = Release|Win32 {58654438-F674-42F7-88FA-73EF90AD80B1}.Release|Win32.Build.0 = Release|Win32 {58654438-F674-42F7-88FA-73EF90AD80B1}.Release|x64.ActiveCfg = Release|x64 @@ -199,6 +190,8 @@ Global {A7D7CE59-2A31-48AE-BED2-A9828E241832}.Release|Win32.Build.0 = Release|Win32 {A7D7CE59-2A31-48AE-BED2-A9828E241832}.Release|x64.ActiveCfg = Release|x64 {A7D7CE59-2A31-48AE-BED2-A9828E241832}.Release|x64.Build.0 = Release|x64 + {D90BC3E3-1341-4849-9354-5F40489D39D1}.Release|Win32.ActiveCfg = Release|Win32 + {D90BC3E3-1341-4849-9354-5F40489D39D1}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -222,10 +215,9 @@ Global {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {3024CF36-85E5-4E00-9608-7002E2C7EF14} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {E7F4DB0A-510D-41EF-B284-6E1DE1CC450D} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} - {987E9374-98A1-44BA-946F-D3472D7A7055} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} - {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {58654438-F674-42F7-88FA-73EF90AD80B1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {19C52A0A-A790-409E-A28A-9745FF990F5C} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} + {D90BC3E3-1341-4849-9354-5F40489D39D1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {B10A2C41-344C-43E0-A32D-B9587C198D8B} = {0FD996A7-464F-4981-8380-3DCA3A244A13} {C9B735E4-75BC-45AC-A5E3-39A6D076F912} = {0FD996A7-464F-4981-8380-3DCA3A244A13} {5A0F4962-E670-4DA2-9E45-52CC47F26E2F} = {0FD996A7-464F-4981-8380-3DCA3A244A13}