FS-7728: fix windows build issues

diff --git a/libs/win32/pcre/libpcre.2013.vcxproj b/libs/win32/pcre/libpcre.2013.vcxproj
index 652331040bc6825da34bb97f49247ac02be456de..d386216a6053d6aac7bf44e55bf15eec3ee0f85a 100644 (file)
--- a/libs/win32/pcre/libpcre.2013.vcxproj
+++ b/libs/win32/pcre/libpcre.2013.vcxproj
@@ -138,6 +138,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Bscmake>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
@@ -157,6 +158,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PreBuildEvent>\r
       <Command>if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" &gt; "$(ProjectDir)..\..\pcre-8.34\pcre.h"</Command>\r
@@ -174,6 +176,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PreBuildEvent>\r
       <Command>if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" &gt; "$(ProjectDir)..\..\pcre-8.34\pcre.h"</Command>\r
@@ -194,6 +197,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PreBuildEvent>\r
       <Command>if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" &gt; "$(ProjectDir)..\..\pcre-8.34\pcre.h"</Command>\r
@@ -239,6 +243,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PreBuildEvent>\r
       <Command>if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" &gt; "$(ProjectDir)..\..\pcre-8.34\pcre.h"</Command>\r
@@ -305,6 +310,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PreBuildEvent>\r
       <Command>if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" &gt; "$(ProjectDir)..\..\pcre-8.34\pcre.h"</Command>\r
@@ -371,6 +377,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PreBuildEvent>\r
       <Command>if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" &gt; "$(ProjectDir)..\..\pcre-8.34\pcre.h"</Command>\r
@@ -436,6 +443,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PreBuildEvent>\r
       <Command>if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" &gt; "$(ProjectDir)..\..\pcre-8.34\pcre.h"</Command>\r

diff --git a/libs/win32/speex/libspeex.2013.vcxproj b/libs/win32/speex/libspeex.2013.vcxproj
index 38b38e5090773c78ca2ed95e00d0c1c234756a90..788083d2f7a811d4b9b80fb6156996ee59ddad49 100644 (file)
--- a/libs/win32/speex/libspeex.2013.vcxproj
+++ b/libs/win32/speex/libspeex.2013.vcxproj
@@ -242,6 +242,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <CompileAs>CompileAsC</CompileAs>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -263,6 +264,7 @@
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -288,6 +290,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -313,6 +316,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -337,6 +341,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <ModuleDefinitionFile>libspeex.def</ModuleDefinitionFile>\r
@@ -360,6 +365,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -384,6 +390,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -402,6 +409,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <CompileAs>CompileAsC</CompileAs>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -424,6 +432,7 @@
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -452,6 +461,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -480,6 +490,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -507,6 +518,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <ModuleDefinitionFile>libspeex.def</ModuleDefinitionFile>\r
@@ -534,6 +546,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r
@@ -561,6 +574,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)libspeex.lib</OutputFile>\r

diff --git a/libs/win32/speex/libspeexdsp.2013.vcxproj b/libs/win32/speex/libspeexdsp.2013.vcxproj
index c4b9cd032637c26a80f22b1ffa188c4c0a2cfbe9..d8b704aa7e6a0033a95315b95e38bc14605dafb7 100644 (file)
--- a/libs/win32/speex/libspeexdsp.2013.vcxproj
+++ b/libs/win32/speex/libspeexdsp.2013.vcxproj
@@ -147,6 +147,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <CompileAs>CompileAsC</CompileAs>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -163,6 +164,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <CompileAs>CompileAsC</CompileAs>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -180,6 +182,7 @@
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -200,6 +203,7 @@
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -223,6 +227,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>../../../bin/libspeexdsp.dll</OutputFile>\r
@@ -260,6 +265,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>../../../bin/libspeexdsp.dll</OutputFile>\r
@@ -294,6 +300,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>../../../lib/libspeexdsp.lib</OutputFile>\r
@@ -322,6 +329,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsC</CompileAs>\r
       <DisableSpecificWarnings>4244;4305;4311;4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>../../../lib/libspeexdsp.lib</OutputFile>\r

diff --git a/libs/win32/sqlite/sqlite.2013.vcxproj b/libs/win32/sqlite/sqlite.2013.vcxproj
index 2c4f69f8127f243b369694a55683f4ca5c4ef922..6621dde50db97364948d6228fe9efc37ec6e19e8 100644 (file)
--- a/libs/win32/sqlite/sqlite.2013.vcxproj
+++ b/libs/win32/sqlite/sqlite.2013.vcxproj
@@ -139,6 +139,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PostBuildEvent>\r
       <Command>\r
@@ -159,6 +160,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PostBuildEvent>\r
       <Command>\r
@@ -173,6 +175,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PostBuildEvent>\r
       <Command>\r
@@ -190,6 +193,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <PostBuildEvent>\r
       <Command>\r
@@ -210,6 +214,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <ModuleDefinitionFile>sqlite3.def</ModuleDefinitionFile>\r
@@ -244,6 +249,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <ModuleDefinitionFile>sqlite3.def</ModuleDefinitionFile>\r
@@ -272,6 +278,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <ModuleDefinitionFile>sqlite3.def</ModuleDefinitionFile>\r
@@ -299,6 +306,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <ModuleDefinitionFile>sqlite3.def</ModuleDefinitionFile>\r

diff --git a/src/mod/endpoints/mod_rtmp/mod_rtmp.2013.vcxproj b/src/mod/endpoints/mod_rtmp/mod_rtmp.2013.vcxproj
index 1e41d6049b3a7eeb2b4cc6463d505ab1442fee71..e1062cadaf421ca613be697d644e8322bdd3a964 100644 (file)
--- a/src/mod/endpoints/mod_rtmp/mod_rtmp.2013.vcxproj
+++ b/src/mod/endpoints/mod_rtmp/mod_rtmp.2013.vcxproj
@@ -51,18 +51,22 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
+    <Import Project="..\..\..\..\w32\openssl-version.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
+    <Import Project="..\..\..\..\w32\openssl-version.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
+    <Import Project="..\..\..\..\w32\openssl-version.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
+    <Import Project="..\..\..\..\w32\openssl-version.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
@@ -88,7 +92,7 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>./libamf/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -101,11 +105,12 @@
       <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
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>./libamf/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -118,11 +123,12 @@
       <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;../../../../x64/Debug/ssleay32.lib;../../../../x64/Debug/libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>./libamf/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -134,11 +140,12 @@
       <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
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>./libamf/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -150,6 +157,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;../../../../x64/Release/ssleay32.lib;../../../../x64/Release/libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
@@ -162,11 +170,16 @@
     <ClCompile Include=".\libamf\src\io.c" />\r
     <ClCompile Include=".\libamf\src\ptrarray.c" />\r
     <ClCompile Include=".\libamf\src\types.c" />\r
+    <ClCompile Include="rtmp_video.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="mod_rtmp.h" />\r
+    <ClInclude Include="rtmp_video.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ProjectReference Include="..\..\..\..\libs\win32\Download OPENSSL.2013.vcxproj">\r
+      <Project>{d578e676-7ec8-4548-bd8b-845c635f14ad}</Project>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2013.vcxproj">\r
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
     </ProjectReference>\r

diff --git a/src/mod/endpoints/mod_verto/mcast/mcast.c b/src/mod/endpoints/mod_verto/mcast/mcast.c
index 617553bcc474ff257154688b06ac1262d2fa1e2e..1e480d0654c3ea7c470abfc0327b1ea2cf4e21c1 100644 (file)
--- a/src/mod/endpoints/mod_verto/mcast/mcast.c
+++ b/src/mod/endpoints/mod_verto/mcast/mcast.c
@@ -38,6 +38,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #ifdef WIN32
+#include <ws2tcpip.h>
 #include <winsock2.h>
 #else
 #include <sys/socket.h>

diff --git a/src/mod/endpoints/mod_verto/mcast/mcast.h b/src/mod/endpoints/mod_verto/mcast/mcast.h
index bc9114abcee03daa3dd92a818a20caff864eacba..83a8e2ff2d24a26a4d22775883fb5ccb4ebb13bd 100644 (file)
--- a/src/mod/endpoints/mod_verto/mcast/mcast.h
+++ b/src/mod/endpoints/mod_verto/mcast/mcast.h
@@ -43,6 +43,7 @@ extern "C" {
 
 #include <sys/types.h>
 #ifdef WIN32
+#include <ws2tcpip.h> // struct 'sockaddr_in6'
 #include <WinSock2.h>
 #else
 #include <sys/socket.h>

diff --git a/src/mod/formats/mod_shout/mod_shout.2013.vcxproj b/src/mod/formats/mod_shout/mod_shout.2013.vcxproj
index e2e9a2c5085316f1d3abf6dfd4a3d43a5e333800..49ce527b26564e4b7cf4ee35b7f8315d382dcdb2 100644 (file)
--- a/src/mod/formats/mod_shout/mod_shout.2013.vcxproj
+++ b/src/mod/formats/mod_shout/mod_shout.2013.vcxproj
@@ -72,7 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -94,7 +94,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -114,7 +114,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -138,7 +138,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r

diff --git a/src/switch_core_video.c b/src/switch_core_video.c
index e583ffe34ff496f506c81a985fcee9a96498fa7b..eaa6c9fe744ac05e17865c516f05bb3f16441463 100644 (file)
--- a/src/switch_core_video.c
+++ b/src/switch_core_video.c
@@ -798,8 +798,8 @@ SWITCH_DECLARE(switch_status_t) switch_img_txt_handle_create(switch_img_txt_hand
        if (FT_Init_FreeType(&new_handle->library)) {
                return SWITCH_STATUS_FALSE;
        }
-#else
-       return SWITCH_STATUS_FALSE;
+/*#else
+       return SWITCH_STATUS_FALSE; */
 #endif
 
        new_handle->pool = pool;