From 240bf74d3a1e5d62abd2840bc8bc51b5f7d09f7f Mon Sep 17 00:00:00 2001 From: Vladimir Date: Fri, 26 Jun 2015 01:55:25 +0300 Subject: [PATCH 1/2] FS-7728: fix windows build issues --- libs/win32/pcre/libpcre.2013.vcxproj | 8 +++++++ libs/win32/speex/libspeex.2013.vcxproj | 14 +++++++++++++ libs/win32/speex/libspeexdsp.2013.vcxproj | 8 +++++++ libs/win32/sqlite/sqlite.2013.vcxproj | 8 +++++++ .../endpoints/mod_rtmp/mod_rtmp.2013.vcxproj | 21 +++++++++++++++---- src/mod/endpoints/mod_verto/mcast/mcast.c | 1 + src/mod/endpoints/mod_verto/mcast/mcast.h | 1 + .../formats/mod_shout/mod_shout.2013.vcxproj | 8 +++---- src/switch_core_video.c | 4 ++-- 9 files changed, 63 insertions(+), 10 deletions(-) diff --git a/libs/win32/pcre/libpcre.2013.vcxproj b/libs/win32/pcre/libpcre.2013.vcxproj index 652331040b..d386216a60 100644 --- a/libs/win32/pcre/libpcre.2013.vcxproj +++ b/libs/win32/pcre/libpcre.2013.vcxproj @@ -138,6 +138,7 @@ Level3 true 4267;4244;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) true @@ -157,6 +158,7 @@ Level3 true 4267;4244;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" > "$(ProjectDir)..\..\pcre-8.34\pcre.h" @@ -174,6 +176,7 @@ Level3 true 4267;4244;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" > "$(ProjectDir)..\..\pcre-8.34\pcre.h" @@ -194,6 +197,7 @@ Level3 true 4267;4244;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" > "$(ProjectDir)..\..\pcre-8.34\pcre.h" @@ -239,6 +243,7 @@ true ProgramDatabase 4267;4244;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" > "$(ProjectDir)..\..\pcre-8.34\pcre.h" @@ -305,6 +310,7 @@ true ProgramDatabase 4267;4244;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" > "$(ProjectDir)..\..\pcre-8.34\pcre.h" @@ -371,6 +377,7 @@ Level3 true 4267;4244;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" > "$(ProjectDir)..\..\pcre-8.34\pcre.h" @@ -436,6 +443,7 @@ Level3 true 4267;4244;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) if not exist "$(ProjectDir)..\..\pcre-8.34\pcre.h" type "$(ProjectDir)\pcre.h" > "$(ProjectDir)..\..\pcre-8.34\pcre.h" diff --git a/libs/win32/speex/libspeex.2013.vcxproj b/libs/win32/speex/libspeex.2013.vcxproj index 38b38e5090..788083d2f7 100644 --- a/libs/win32/speex/libspeex.2013.vcxproj +++ b/libs/win32/speex/libspeex.2013.vcxproj @@ -242,6 +242,7 @@ MultiThreadedDebugDLL TurnOffAllWarnings CompileAsC + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -263,6 +264,7 @@ TurnOffAllWarnings CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -288,6 +290,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -313,6 +316,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -337,6 +341,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) libspeex.def @@ -360,6 +365,7 @@ Level4 EditAndContinue CompileAsC + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -384,6 +390,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -402,6 +409,7 @@ MultiThreadedDebugDLL TurnOffAllWarnings CompileAsC + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -424,6 +432,7 @@ TurnOffAllWarnings CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -452,6 +461,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -480,6 +490,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -507,6 +518,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) libspeex.def @@ -534,6 +546,7 @@ Level4 ProgramDatabase CompileAsC + /FS %(AdditionalOptions) $(OutDir)libspeex.lib @@ -561,6 +574,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) $(OutDir)libspeex.lib diff --git a/libs/win32/speex/libspeexdsp.2013.vcxproj b/libs/win32/speex/libspeexdsp.2013.vcxproj index c4b9cd0326..d8b704aa7e 100644 --- a/libs/win32/speex/libspeexdsp.2013.vcxproj +++ b/libs/win32/speex/libspeexdsp.2013.vcxproj @@ -147,6 +147,7 @@ MultiThreadedDebugDLL TurnOffAllWarnings CompileAsC + /FS %(AdditionalOptions) @@ -163,6 +164,7 @@ MultiThreadedDebugDLL TurnOffAllWarnings CompileAsC + /FS %(AdditionalOptions) @@ -180,6 +182,7 @@ TurnOffAllWarnings CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) @@ -200,6 +203,7 @@ TurnOffAllWarnings CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) @@ -223,6 +227,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) ../../../bin/libspeexdsp.dll @@ -260,6 +265,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) ../../../bin/libspeexdsp.dll @@ -294,6 +300,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) ../../../lib/libspeexdsp.lib @@ -322,6 +329,7 @@ ProgramDatabase CompileAsC 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + /FS %(AdditionalOptions) ../../../lib/libspeexdsp.lib diff --git a/libs/win32/sqlite/sqlite.2013.vcxproj b/libs/win32/sqlite/sqlite.2013.vcxproj index 2c4f69f812..6621dde50d 100644 --- a/libs/win32/sqlite/sqlite.2013.vcxproj +++ b/libs/win32/sqlite/sqlite.2013.vcxproj @@ -139,6 +139,7 @@ EnableFastChecks MultiThreadedDebugDLL TurnOffAllWarnings + /FS %(AdditionalOptions) @@ -159,6 +160,7 @@ EnableFastChecks MultiThreadedDebugDLL TurnOffAllWarnings + /FS %(AdditionalOptions) @@ -173,6 +175,7 @@ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings + /FS %(AdditionalOptions) @@ -190,6 +193,7 @@ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings + /FS %(AdditionalOptions) @@ -210,6 +214,7 @@ TurnOffAllWarnings ProgramDatabase + /FS %(AdditionalOptions) sqlite3.def @@ -244,6 +249,7 @@ TurnOffAllWarnings ProgramDatabase + /FS %(AdditionalOptions) sqlite3.def @@ -272,6 +278,7 @@ TurnOffAllWarnings ProgramDatabase + /FS %(AdditionalOptions) sqlite3.def @@ -299,6 +306,7 @@ TurnOffAllWarnings ProgramDatabase + /FS %(AdditionalOptions) sqlite3.def diff --git a/src/mod/endpoints/mod_rtmp/mod_rtmp.2013.vcxproj b/src/mod/endpoints/mod_rtmp/mod_rtmp.2013.vcxproj index 1e41d6049b..e1062cadaf 100644 --- a/src/mod/endpoints/mod_rtmp/mod_rtmp.2013.vcxproj +++ b/src/mod/endpoints/mod_rtmp/mod_rtmp.2013.vcxproj @@ -51,18 +51,22 @@ + + + + @@ -88,7 +92,7 @@ - ./libamf/src;%(AdditionalIncludeDirectories) + ./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) @@ -101,11 +105,12 @@ false + 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) - ./libamf/src;%(AdditionalIncludeDirectories) + ./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) @@ -118,11 +123,12 @@ false + 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) - ./libamf/src;%(AdditionalIncludeDirectories) + ./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) @@ -134,11 +140,12 @@ false + 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) - ./libamf/src;%(AdditionalIncludeDirectories) + ./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) @@ -150,6 +157,7 @@ false + 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) @@ -162,11 +170,16 @@ + + + + {d578e676-7ec8-4548-bd8b-845c635f14ad} + {202d7a4e-760d-4d0e-afa1-d7459ced30ff} diff --git a/src/mod/endpoints/mod_verto/mcast/mcast.c b/src/mod/endpoints/mod_verto/mcast/mcast.c index 617553bcc4..1e480d0654 100644 --- a/src/mod/endpoints/mod_verto/mcast/mcast.c +++ b/src/mod/endpoints/mod_verto/mcast/mcast.c @@ -38,6 +38,7 @@ #include #include #ifdef WIN32 +#include #include #else #include diff --git a/src/mod/endpoints/mod_verto/mcast/mcast.h b/src/mod/endpoints/mod_verto/mcast/mcast.h index bc9114abce..83a8e2ff2d 100644 --- 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 #ifdef WIN32 +#include // struct 'sockaddr_in6' #include #else #include diff --git a/src/mod/formats/mod_shout/mod_shout.2013.vcxproj b/src/mod/formats/mod_shout/mod_shout.2013.vcxproj index e2e9a2c508..49ce527b26 100644 --- a/src/mod/formats/mod_shout/mod_shout.2013.vcxproj +++ b/src/mod/formats/mod_shout/mod_shout.2013.vcxproj @@ -72,7 +72,7 @@ Disabled - ..\..\..\..\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) + ..\..\..\..\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) CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -94,7 +94,7 @@ Disabled - ..\..\..\..\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) + ..\..\..\..\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) CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -114,7 +114,7 @@ MaxSpeed true - ..\..\..\..\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) + ..\..\..\..\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) CURL_STATICLIB;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -138,7 +138,7 @@ MaxSpeed true - ..\..\..\..\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) + ..\..\..\..\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) CURL_STATICLIB;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/src/switch_core_video.c b/src/switch_core_video.c index e583ffe34f..eaa6c9fe74 100644 --- 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; From b5b7740a1de5ac9737126ccd7f00da5e1bddb127 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 5 Aug 2015 01:35:05 -0500 Subject: [PATCH 2/2] FS-7728: working windows build minus video features --- Freeswitch.2013.sln | 1 + .../mod_conference/mod_conference.2013.vcxproj | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Freeswitch.2013.sln b/Freeswitch.2013.sln index 0c59ec7f26..fd4ac9fa52 100644 --- a/Freeswitch.2013.sln +++ b/Freeswitch.2013.sln @@ -4028,6 +4028,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {CBD81696-EFB4-4D2F-8451-1B8DAA86155A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {3B08FEFD-4D3D-4C16-BA94-EE83509E32A0} = {57D119DC-484F-420F-B9E9-8589FD9A8DF8} {CDE9B06A-3C27-4987-8FAE-DF1006BC705D} = {DB1024A8-41BF-4AD7-9AE6-13202230D1F3} diff --git a/src/mod/applications/mod_conference/mod_conference.2013.vcxproj b/src/mod/applications/mod_conference/mod_conference.2013.vcxproj index 38de7b5291..0e75fb3745 100644 --- a/src/mod/applications/mod_conference/mod_conference.2013.vcxproj +++ b/src/mod/applications/mod_conference/mod_conference.2013.vcxproj @@ -132,6 +132,7 @@ false + $(ProjectDir);%(AdditionalIncludeDirectories) false @@ -141,6 +142,16 @@ + + + + + + + + + + @@ -153,6 +164,9 @@ false + + +