diff options
-rw-r--r-- | bin10/mir_dev.sln | 10 | ||||
-rw-r--r-- | bin10/mir_full.sln | 10 | ||||
-rw-r--r-- | bin10/mir_full_pro.sln | 11 | ||||
-rw-r--r-- | bin12/mir_dev.sln | 12 | ||||
-rw-r--r-- | bin12/mir_full.sln | 12 | ||||
-rw-r--r-- | bin14/mir_dev.sln | 12 | ||||
-rw-r--r-- | bin14/mir_full.sln | 12 | ||||
-rw-r--r-- | libs/libevent/include/event2/event-config.h | 2 | ||||
-rw-r--r-- | libs/libevent/libevent.vcxproj | 42 | ||||
-rw-r--r-- | libs/libevent/libevent.vcxproj.filters | 4 | ||||
-rw-r--r-- | libs/libevent/libevent_12.vcxproj | 212 | ||||
-rw-r--r-- | libs/libevent/libevent_12.vcxproj.filters | 264 | ||||
-rw-r--r-- | libs/libevent/src/arc4random.cxx (renamed from libs/libevent/src/arc4random.c) | 14 | ||||
-rw-r--r-- | libs/libevent/src/evutil_rand.c | 2 | ||||
-rw-r--r-- | libs/libevent/src/stdafx.cxx | 2 | ||||
-rw-r--r-- | libs/libevent/src/stdafx.h | 2 |
16 files changed, 134 insertions, 489 deletions
diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 4582fc98d1..9e871268ac 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -447,6 +447,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_variables", "..\plugins\M EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plugins\MirLua\Modules\m_msg_buttonsbar\m_msg_buttonsbar.vcxproj", "{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -2046,6 +2048,14 @@ Global {DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|Win32.Build.0 = Release|Win32
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.ActiveCfg = Release|x64
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.Build.0 = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.Build.0 = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.ActiveCfg = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.Build.0 = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.ActiveCfg = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 5aaacd178b..4b8e49b570 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -445,6 +445,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_variables", "..\plugins\M EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plugins\MirLua\Modules\m_msg_buttonsbar\m_msg_buttonsbar.vcxproj", "{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -2025,6 +2027,14 @@ Global {DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|Win32.Build.0 = Release|Win32
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.ActiveCfg = Release|x64
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.Build.0 = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.Build.0 = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.ActiveCfg = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.Build.0 = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.ActiveCfg = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index fcb7b17e18..05ece0615d 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -479,6 +479,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_variables", "..\plugins\M EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plugins\MirLua\Modules\m_msg_buttonsbar\m_msg_buttonsbar.vcxproj", "{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -2051,6 +2053,14 @@ Global {DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|Win32.Build.0 = Release|Win32
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.ActiveCfg = Release|x64
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.Build.0 = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.Build.0 = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.ActiveCfg = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.Build.0 = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.ActiveCfg = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -2126,6 +2136,7 @@ Global {D5C9CA74-4E25-478A-B890-75EB13E6DB1C} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{E604CD58-4579-4F69-9D6A-2605FD7CF716} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{9299B507-1AF9-4C93-9560-5F637D1E0C9E} = {48032210-388E-4227-8DE5-61680B2B3A30}
{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}
{20D781FB-4A20-4B75-B863-304A47182966} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}
diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index d4d2169a60..5df3a979c1 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
+# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
@@ -451,6 +451,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_variables", "..\plugins\M EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plugins\MirLua\Modules\m_msg_buttonsbar\m_msg_buttonsbar.vcxproj", "{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -2057,6 +2059,14 @@ Global {DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|Win32.Build.0 = Release|Win32
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.ActiveCfg = Release|x64
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.Build.0 = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.Build.0 = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.ActiveCfg = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.Build.0 = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.ActiveCfg = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index 6744f8a9ff..097ba38537 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
+# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
@@ -449,6 +449,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_variables", "..\plugins\M EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plugins\MirLua\Modules\m_msg_buttonsbar\m_msg_buttonsbar.vcxproj", "{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -2037,6 +2039,14 @@ Global {DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|Win32.Build.0 = Release|Win32
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.ActiveCfg = Release|x64
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.Build.0 = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.Build.0 = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.ActiveCfg = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.Build.0 = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.ActiveCfg = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln index 0b777e7306..130e5229a1 100644 --- a/bin14/mir_dev.sln +++ b/bin14/mir_dev.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 14 for Windows Desktop
+# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
@@ -451,6 +451,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_variables", "..\plugins\M EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plugins\MirLua\Modules\m_msg_buttonsbar\m_msg_buttonsbar.vcxproj", "{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -2057,6 +2059,14 @@ Global {DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|Win32.Build.0 = Release|Win32
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.ActiveCfg = Release|x64
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.Build.0 = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.Build.0 = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.ActiveCfg = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.Build.0 = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.ActiveCfg = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln index 5d820a78e1..85f026e9a6 100644 --- a/bin14/mir_full.sln +++ b/bin14/mir_full.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 14 for Windows Desktop
+# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
@@ -449,6 +449,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_variables", "..\plugins\M EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plugins\MirLua\Modules\m_msg_buttonsbar\m_msg_buttonsbar.vcxproj", "{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -2037,6 +2039,14 @@ Global {DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|Win32.Build.0 = Release|Win32
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.ActiveCfg = Release|x64
{DCBE5EC2-84B2-4C03-810C-BD13D975D8D9}.Release|x64.Build.0 = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|Win32.Build.0 = Debug|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.ActiveCfg = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Debug|x64.Build.0 = Debug|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.ActiveCfg = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
+ {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/libs/libevent/include/event2/event-config.h b/libs/libevent/include/event2/event-config.h index 395396efa3..6fa812f3ed 100644 --- a/libs/libevent/include/event2/event-config.h +++ b/libs/libevent/include/event2/event-config.h @@ -290,7 +290,7 @@ /* #undef EVENT__HAVE_STRTOK_R */ /* Define to 1 if you have the `strtoll' function. */ -#define EVENT__HAVE_STRTOLL +/* #define EVENT__HAVE_STRTOLL */ /* Define to 1 if the system has the type `struct addrinfo'. */ #define EVENT__HAVE_STRUCT_ADDRINFO diff --git a/libs/libevent/libevent.vcxproj b/libs/libevent/libevent.vcxproj new file mode 100644 index 0000000000..87da0181b8 --- /dev/null +++ b/libs/libevent/libevent.vcxproj @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGUID>{46D53888-E60E-32A7-91EB-6336DE0D84D8}</ProjectGUID>
+ <ProjectName>libevent</ProjectName>
+ </PropertyGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />
+ </ImportGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>.\include;.\src\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="src\WIN32-Code\*.c">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/libs/libevent/libevent.vcxproj.filters b/libs/libevent/libevent.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/libs/libevent/libevent.vcxproj.filters @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+</Project>
\ No newline at end of file diff --git a/libs/libevent/libevent_12.vcxproj b/libs/libevent/libevent_12.vcxproj deleted file mode 100644 index 11876a5aa9..0000000000 --- a/libs/libevent/libevent_12.vcxproj +++ /dev/null @@ -1,212 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGUID>{46D53888-E60E-32A7-91EB-6336DE0D84D8}</ProjectGUID>
- <ProjectName>libevent</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <PlatformToolset>v120_xp</PlatformToolset>
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Configuration)\Libs\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Configuration)64\Libs\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Configuration)\Libs\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Configuration)64\Libs\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IgnoreImportLibrary>true</IgnoreImportLibrary>
- </PropertyGroup>
- <PropertyGroup>
- <TargetExt>.mir</TargetExt>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>include;src\compat;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <Optimization>Disabled</Optimization>
- <WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>_WINDOWS;_DEBUG;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\win32</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>include;src\compat;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <Optimization>Full</Optimization>
- <WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>_WINDOWS;NDEBUG;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\win32</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <AdditionalIncludeDirectories>include;src\compat;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <Optimization>Disabled</Optimization>
- <WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>_WINDOWS;_DEBUG;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\win64</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <AdditionalIncludeDirectories>include;src\compat;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <Optimization>Full</Optimization>
- <WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>_WINDOWS;NDEBUG;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\win64</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="src\bufferevent-internal.h" />
- <ClInclude Include="src\changelist-internal.h" />
- <ClInclude Include="src\defer-internal.h" />
- <ClInclude Include="src\epolltable-internal.h" />
- <ClInclude Include="src\evbuffer-internal.h" />
- <ClInclude Include="src\event-internal.h" />
- <ClInclude Include="src\evmap-internal.h" />
- <ClInclude Include="src\evrpc-internal.h" />
- <ClInclude Include="src\evsignal-internal.h" />
- <ClInclude Include="src\evthread-internal.h" />
- <ClInclude Include="src\ht-internal.h" />
- <ClInclude Include="src\http-internal.h" />
- <ClInclude Include="src\iocp-internal.h" />
- <ClInclude Include="src\ipv6-internal.h" />
- <ClInclude Include="src\log-internal.h" />
- <ClInclude Include="src\minheap-internal.h" />
- <ClInclude Include="src\mm-internal.h" />
- <ClInclude Include="src\ratelim-internal.h" />
- <ClInclude Include="src\strlcpy-internal.h" />
- <ClInclude Include="src\util-internal.h" />
- <ClInclude Include="src\compat\sys\queue.h" />
- <ClInclude Include="src\WIN32-Code\getopt.h" />
- <ClInclude Include="include\evdns.h" />
- <ClInclude Include="include\evrpc.h" />
- <ClInclude Include="include\event.h" />
- <ClInclude Include="include\evhttp.h" />
- <ClInclude Include="include\evutil.h" />
- <ClInclude Include="include\event2\buffer.h" />
- <ClInclude Include="include\event2\bufferevent.h" />
- <ClInclude Include="include\event2\bufferevent_compat.h" />
- <ClInclude Include="include\event2\bufferevent_struct.h" />
- <ClInclude Include="include\event2\buffer_compat.h" />
- <ClInclude Include="include\event2\dns.h" />
- <ClInclude Include="include\event2\dns_compat.h" />
- <ClInclude Include="include\event2\dns_struct.h" />
- <ClInclude Include="include\event2\event.h" />
- <ClInclude Include="include\event2\event_compat.h" />
- <ClInclude Include="include\event2\event_struct.h" />
- <ClInclude Include="include\event2\http.h" />
- <ClInclude Include="include\event2\http_compat.h" />
- <ClInclude Include="include\event2\http_struct.h" />
- <ClInclude Include="include\event2\keyvalq_struct.h" />
- <ClInclude Include="include\event2\listener.h" />
- <ClInclude Include="include\event2\rpc.h" />
- <ClInclude Include="include\event2\rpc_compat.h" />
- <ClInclude Include="include\event2\rpc_struct.h" />
- <ClInclude Include="include\event2\tag.h" />
- <ClInclude Include="include\event2\tag_compat.h" />
- <ClInclude Include="include\event2\thread.h" />
- <ClInclude Include="include\event2\util.h" />
- <ClInclude Include="include\event2\visibility.h" />
- <ClInclude Include="include\event2\event-config.h" />
- <ClInclude Include="include\event2\bufferevent_ssl.h" />
- <ClCompile Include="src\buffer.c" />
- <ClCompile Include="src\bufferevent.c" />
- <ClCompile Include="src\bufferevent_filter.c" />
- <ClCompile Include="src\bufferevent_pair.c" />
- <ClCompile Include="src\bufferevent_ratelim.c" />
- <ClCompile Include="src\bufferevent_sock.c" />
- <ClCompile Include="src\event.c" />
- <ClCompile Include="src\evmap.c" />
- <ClCompile Include="src\evthread.c" />
- <ClCompile Include="src\evutil.c" />
- <ClCompile Include="src\evutil_rand.c" />
- <ClCompile Include="src\evutil_time.c" />
- <ClCompile Include="src\listener.c" />
- <ClCompile Include="src\log.c" />
- <ClCompile Include="src\signal.c" />
- <ClCompile Include="src\strlcpy.c" />
- <ClCompile Include="src\bufferevent_openssl.c" />
- <ClCompile Include="src\evthread_win32.c" />
- <ClCompile Include="src\buffer_iocp.c" />
- <ClCompile Include="src\bufferevent_async.c" />
- <ClCompile Include="src\event_iocp.c" />
- <ClCompile Include="src\win32select.c" />
- <ClCompile Include="src\event_tagging.c" />
- <ClCompile Include="src\http.c" />
- <ClCompile Include="src\evdns.c" />
- <ClCompile Include="src\evrpc.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/libs/libevent/libevent_12.vcxproj.filters b/libs/libevent/libevent_12.vcxproj.filters deleted file mode 100644 index 52a3297f3a..0000000000 --- a/libs/libevent/libevent_12.vcxproj.filters +++ /dev/null @@ -1,264 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <ClCompile Include="src\buffer.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\bufferevent.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\bufferevent_filter.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\bufferevent_pair.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\bufferevent_ratelim.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\bufferevent_sock.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\event.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\evmap.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\evthread.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\evutil.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\evutil_rand.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\evutil_time.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\listener.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\log.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\signal.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\strlcpy.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\bufferevent_openssl.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\evthread_win32.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\buffer_iocp.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\bufferevent_async.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\event_iocp.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\win32select.c">
- <Filter>Source Core</Filter>
- </ClCompile>
- <ClCompile Include="src\event_tagging.c">
- <Filter>Source Extra</Filter>
- </ClCompile>
- <ClCompile Include="src\http.c">
- <Filter>Source Extra</Filter>
- </ClCompile>
- <ClCompile Include="src\evdns.c">
- <Filter>Source Extra</Filter>
- </ClCompile>
- <ClCompile Include="src\evrpc.c">
- <Filter>Source Extra</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\bufferevent-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\changelist-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\defer-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\epolltable-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\evbuffer-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\event-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\evmap-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\evrpc-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\evsignal-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\evthread-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\ht-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\http-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\iocp-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\ipv6-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\log-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\minheap-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\mm-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\ratelim-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\strlcpy-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\util-internal.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\compat\sys\queue.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="src\WIN32-Code\getopt.h">
- <Filter>Headers Private</Filter>
- </ClInclude>
- <ClInclude Include="include\evdns.h">
- <Filter>Header Compat</Filter>
- </ClInclude>
- <ClInclude Include="include\evrpc.h">
- <Filter>Header Compat</Filter>
- </ClInclude>
- <ClInclude Include="include\event.h">
- <Filter>Header Compat</Filter>
- </ClInclude>
- <ClInclude Include="include\evhttp.h">
- <Filter>Header Compat</Filter>
- </ClInclude>
- <ClInclude Include="include\evutil.h">
- <Filter>Header Compat</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\buffer.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\bufferevent.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\bufferevent_compat.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\bufferevent_struct.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\buffer_compat.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\dns.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\dns_compat.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\dns_struct.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\event.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\event_compat.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\event_struct.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\http.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\http_compat.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\http_struct.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\keyvalq_struct.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\listener.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\rpc.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\rpc_compat.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\rpc_struct.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\tag.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\tag_compat.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\thread.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\util.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\visibility.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\event-config.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- <ClInclude Include="include\event2\bufferevent_ssl.h">
- <Filter>Headers Public</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <Filter Include="Header Files">
- <UniqueIdentifier>{918036C9-880E-383E-A0A0-E2F1133C4BF0}</UniqueIdentifier>
- </Filter>
- <Filter Include="Headers Private">
- <UniqueIdentifier>{403FD3F2-243C-3501-846D-EC6DB43B0865}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Compat">
- <UniqueIdentifier>{6259BD7B-787D-3652-9A11-0698644E1128}</UniqueIdentifier>
- </Filter>
- <Filter Include="Headers Public">
- <UniqueIdentifier>{D8BDFFA3-4BC2-3E42-BC8E-450D2147C8CA}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Core">
- <UniqueIdentifier>{70C5E5A7-1F69-39E0-8BF9-5F35EFB07481}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Extra">
- <UniqueIdentifier>{D7733A27-70AE-358A-911E-F7687E9FECFF}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
-</Project>
diff --git a/libs/libevent/src/arc4random.c b/libs/libevent/src/arc4random.cxx index a2338e692a..40d6642e58 100644 --- a/libs/libevent/src/arc4random.c +++ b/libs/libevent/src/arc4random.cxx @@ -52,8 +52,10 @@ #ifndef ARC4RANDOM_NO_INCLUDES #include "evconfig-private.h" #ifdef _WIN32 +#include <Windows.h> #include <wincrypt.h> #include <process.h> +#include <stdint.h> #else #include <fcntl.h> #include <unistd.h> @@ -91,10 +93,9 @@ static pid_t arc4_stir_pid; static int arc4_count; static int arc4_seeded_ok; -static inline unsigned char arc4_getbyte(void); +static unsigned char arc4_getbyte(void); -static inline void -arc4_init(void) +static void arc4_init(void) { int n; @@ -104,8 +105,7 @@ arc4_init(void) rs.j = 0; } -static inline void -arc4_addrandom(const unsigned char *dat, int datlen) +static void arc4_addrandom(const unsigned char *dat, int datlen) { int n; unsigned char si; @@ -422,7 +422,7 @@ arc4_stir_if_needed(void) } } -static inline unsigned char +static unsigned char arc4_getbyte(void) { unsigned char si, sj; @@ -436,7 +436,7 @@ arc4_getbyte(void) return (rs.s[(si + sj) & 0xff]); } -static inline unsigned int +static unsigned int arc4_getword(void) { unsigned int val; diff --git a/libs/libevent/src/evutil_rand.c b/libs/libevent/src/evutil_rand.c index 046a14b07a..0402772db3 100644 --- a/libs/libevent/src/evutil_rand.c +++ b/libs/libevent/src/evutil_rand.c @@ -131,7 +131,7 @@ static void *arc4rand_lock; #define ARC4RANDOM_NORANDOM #define ARC4RANDOM_NOUNIFORM -#include "./arc4random.c" +#include "./arc4random.cxx" #ifndef EVENT__DISABLE_THREAD_SUPPORT int diff --git a/libs/libevent/src/stdafx.cxx b/libs/libevent/src/stdafx.cxx new file mode 100644 index 0000000000..0fb604da7c --- /dev/null +++ b/libs/libevent/src/stdafx.cxx @@ -0,0 +1,2 @@ +
+#include "stdafx.h"
\ No newline at end of file diff --git a/libs/libevent/src/stdafx.h b/libs/libevent/src/stdafx.h new file mode 100644 index 0000000000..d78b7834c8 --- /dev/null +++ b/libs/libevent/src/stdafx.h @@ -0,0 +1,2 @@ +
+// just a stub
\ No newline at end of file |