FS-7966: multiple fixes for msvc 2015 build, fix openssl linking

diff --git a/Freeswitch.2015.sln b/Freeswitch.2015.sln
index 52a148b4648dd8437c120e861f05397ab1704700..8e1e3c16abbb391f61bb3b3e73fbb92fc362d758 100644 (file)
--- a/Freeswitch.2015.sln
+++ b/Freeswitch.2015.sln
@@ -4031,7 +4031,6 @@ Global
                HideSolutionNode = FALSE\r
        EndGlobalSection\r
        GlobalSection(NestedProjects) = preSolution\r
-               {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}\r
                {CBD81696-EFB4-4D2F-8451-1B8DAA86155A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {3B08FEFD-4D3D-4C16-BA94-EE83509E32A0} = {57D119DC-484F-420F-B9E9-8589FD9A8DF8}\r
                {CDE9B06A-3C27-4987-8FAE-DF1006BC705D} = {DB1024A8-41BF-4AD7-9AE6-13202230D1F3}\r

diff --git a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj
index 7b3eb9d1f9f776ae8fed4fe46c3baa0071896460..dcac8e44eeaba9470599daaef03eaab29b54605e 100644 (file)
--- a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj
+++ b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj
@@ -105,7 +105,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;../../../../Win32/Release/ssleay32.lib;../../../../Win32/Release/libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;../../../../Win32/$(Configuration)/ssleay32.lib;../../../../Win32/$(Configuration)/libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
@@ -140,7 +140,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;../../../../Win32/Release/ssleay32.lib;../../../../Win32/Release/libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;../../../../Win32/$(Configuration)/ssleay32.lib;../../../../Win32/$(Configuration)/libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r