From 2bd4e57499e47712ec7ac9a9ee7e4a8b3b68642f Mon Sep 17 00:00:00 2001 From: Mikhail Barg Date: Tue, 18 Apr 2017 16:29:42 +0300 Subject: Update for re/rem/baresip windows projects (#235) * Updated MSVS projects to vs2015 and changed structure * Removed exports_avcodec from static.c, removed wsock32.lib from .vcxproj --- mk/win32/baresip.vcproj | 259 -------------------------- mk/win32/baresip.vcxproj | 380 +++++++++++++++++++++------------------ mk/win32/baresip.vcxproj.filters | 366 +++++++++++++++++++++++++++++++++++++ mk/win32/static.c | 2 - modules/dshow/dshow.cpp | 5 +- 5 files changed, 573 insertions(+), 439 deletions(-) delete mode 100644 mk/win32/baresip.vcproj create mode 100644 mk/win32/baresip.vcxproj.filters diff --git a/mk/win32/baresip.vcproj b/mk/win32/baresip.vcproj deleted file mode 100644 index 6a4197c..0000000 --- a/mk/win32/baresip.vcproj +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mk/win32/baresip.vcxproj b/mk/win32/baresip.vcxproj index 9adb612..c321b5f 100644 --- a/mk/win32/baresip.vcxproj +++ b/mk/win32/baresip.vcxproj @@ -1,178 +1,204 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - baresip-win32 - {4B89C2D8-FB32-4D7C-9019-752A5664781C} - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\Win32\Debug\ - c:\tmp\baresip-win32\Debug\ - false - ..\..\Win32\Release\ - c:\tmp\baresip-win32\release\ - false - - - - Disabled - include;..\..\include;..\..\..\re\include;..\..\..\rem\include;..\..\..\ffmpeg-win32-dev\include;..\..\..\;%(AdditionalIncludeDirectories) - WIN32;STATIC;HAVE_IO_H;HAVE_SELECT;USE_VIDEO;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - CompileAsC - 4142;%(DisableSpecificWarnings) - $(IntDir)/%(RelativeDir)/ - - - winmm.lib wsock32.lib ..\..\..\re\Win32\Debug\re-win32.lib ..\..\..\rem\Win32\Debug\rem-win32.lib %(AdditionalOptions) - $(OutDir)baresip-win32.exe - ..\..\..\ffmpeg-win32-dev\lib;%(AdditionalLibraryDirectories) - true - $(OutDir)baresip-win32.pdb - Console - MachineX86 - avcodec.lib;avutil.lib;%(AdditionalDependencies) - - - - - include;..\..\include;..\..\..\re\include;..\..\..\rem\include;..\..\..\ffmpeg-win32-dev\include;..\..\..\;%(AdditionalIncludeDirectories) - WIN32;STATIC;HAVE_IO_H;HAVE_SELECT;USE_VIDEO;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - ProgramDatabase - 4142;%(DisableSpecificWarnings) - $(IntDir)/%(RelativeDir)/ - - - winmm.lib wsock32.lib ..\..\..\re\Win32\Release\re.lib ..\..\..\rem\Win32\Release\rem.lib %(AdditionalOptions) - $(OutDir)baresip-win32.exe - ..\..\..\ffmpeg-win32-dev\lib;%(AdditionalLibraryDirectories) - true - Console - true - true - MachineX86 - avcodec.lib;avutil.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - CompileAsCpp - CompileAsCpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3e767371-a72b-4f5c-a695-8f844b0889c5} - - - {40b28df6-4b4a-411a-9eb7-8d80c2a29b9d} - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + baresip-win32 + {4B89C2D8-FB32-4D7C-9019-752A5664781C} + Win32Proj + 8.1 + + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\..\$(Platform)\$(Configuration)\bin\ + ..\..\$(Platform)\$(Configuration)\tmp\mk\win32\ + false + ..\..\$(Platform)\$(Configuration)\bin\ + ..\..\$(Platform)\$(Configuration)\tmp\mk\win32\ + false + + + + Disabled + include;..\..\include;..\..\..\re\include;..\..\..\rem\include;..\..\..\misc;..\..\..\dirent\include;%(AdditionalIncludeDirectories) + WIN32;STATIC;HAVE_IO_H;HAVE_SELECT;USE_VIDEO;_CRT_SECURE_NO_DEPRECATE;FD_SETSIZE=1024;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + CompileAsC + 4142;%(DisableSpecificWarnings) + $(IntDir)%(RelativeDir)%(Filename).obj + + + winmm.lib ..\..\..\re\$(Platform)\$(Configuration)\bin\re-win32.lib ..\..\..\rem\$(Platform)\$(Configuration)\bin\rem-win32.lib %(AdditionalOptions) + $(OutDir)baresip-win32.exe + %(AdditionalLibraryDirectories) + true + $(OutDir)baresip-win32.pdb + Console + MachineX86 + %(AdditionalDependencies) + + + + + include;..\..\include;..\..\..\re\include;..\..\..\rem\include;..\..\..\misc;..\..\..\dirent\include;%(AdditionalIncludeDirectories) + WIN32;STATIC;HAVE_IO_H;HAVE_SELECT;USE_VIDEO;_CRT_SECURE_NO_DEPRECATE;FD_SETSIZE=1024;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + 4142;%(DisableSpecificWarnings) + $(IntDir)%(RelativeDir)%(Filename).obj + + + winmm.lib wsock32.lib ..\..\..\re\$(Platform)\$(Configuration)\bin\re-win32.lib ..\..\..\rem\$(Platform)\$(Configuration)\bin\rem-win32.lib %(AdditionalOptions) + $(OutDir)baresip-win32.exe + %(AdditionalLibraryDirectories) + true + Console + true + true + MachineX86 + %(AdditionalDependencies) + + + + + {3e767371-a72b-4f5c-a695-8f844b0889c5} + + + {40b28df6-4b4a-411a-9eb7-8d80c2a29b9d} + + + + + + + + + + + + + + + + + + + + + + + + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mk/win32/baresip.vcxproj.filters b/mk/win32/baresip.vcxproj.filters new file mode 100644 index 0000000..5098a2b --- /dev/null +++ b/mk/win32/baresip.vcxproj.filters @@ -0,0 +1,366 @@ + + + + + {2334866b-8357-4e18-8898-48db4dfe2a15} + + + {5c30c989-28e5-402f-aaa0-860eafa95cc5} + + + {f5f435ce-121f-4b09-b66f-89e75e8abb40} + + + {7f749aed-9d81-46c6-bdde-690ddc51a0a4} + + + {6c97676c-7c18-404f-85a1-2fded4f104e3} + + + {f528695e-cf16-4c35-89ed-adcc330b63bc} + + + {b8e32268-7d2c-46ae-b6a1-d7b02bbd4026} + + + {0e11ace7-27c2-4ad3-8b5e-b3bf772f0b4d} + + + {f44d6650-15a0-4fb3-8fe3-d91f522be831} + + + {6606d763-a0be-4bcc-a689-a9e5e38df7f5} + + + {785597c1-f018-4f86-ae98-4855e6130bf7} + + + {b139606b-86de-4c90-af91-f44b04bd1330} + + + {4c01b3b6-a748-4cf1-af45-a8d5b7735267} + + + {3c2cd0c3-9de0-42ca-8f3a-6d7d929ce501} + + + {e679754c-643a-4284-9ed6-bf6fdc73e152} + + + {8ca10960-9be4-4d19-9e32-2ae5bc415c0a} + + + {1def0f02-ca40-49ee-b5e1-95aac5d2dda3} + + + {5446737f-2a0f-4b4f-a86e-55d9c20118e7} + + + {ebbcb368-d1fa-4899-80cf-e43ff4fde9b2} + + + {a7b0f22a-b82a-4594-a367-d8b8a9882f0d} + + + {7ceb961c-1033-4259-8f3e-ffa2d28a0f12} + + + {c093ccc3-d662-46e0-83df-2eb34e7e7d21} + + + {c82f29fb-bb8d-45c7-ad53-d25e997c1453} + + + {ed5cc330-666d-4f9a-81a2-db7873b7abaa} + + + {31ac6861-a9e9-467a-82ae-53d1d929e696} + + + {6e5dac26-781e-4683-958f-2e18fdc0b42e} + + + {5a3c72cb-a1a5-4c46-b0b5-761d3677e56a} + + + {a4d5f1d9-5629-479e-86d4-4e7b6d58a38a} + + + {044bc40b-b2a8-4450-b76a-d959559df6b1} + + + {71dc9cb5-19b1-4f74-bc23-02ca6b5a10b3} + + + {bc7810ea-bc52-4bee-a15c-aed12cf2a777} + + + {8e7e8b8a-dbe7-4b58-80f3-e632b40d0e4e} + + + {e3bd480b-289e-4754-b1a2-55ea85a7ef45} + + + + + include + + + src + + + src + + + modules\amr + + + modules\natpmp + + + modules\presence + + + modules\srtp + + + modules\vidbridge + + + modules\winwave + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src\video + + + src\video + + + src\video + + + src\video + + + src\video + + + src\video + + + src\video + + + src\video + + + src\static + + + modules\account + + + modules\amr + + + modules\amr + + + modules\auloop + + + modules\b2bua + + + modules\cons + + + modules\contact + + + modules\debug_cmd + + + modules\dshow + + + modules\echo + + + modules\g711 + + + modules\httpd + + + modules\ice + + + modules\l16 + + + modules\menu + + + modules\mwi + + + modules\natbd + + + modules\natpmp + + + modules\natpmp + + + modules\presence + + + modules\presence + + + modules\presence + + + modules\presence + + + modules\selfview + + + modules\srtp + + + modules\srtp + + + modules\stun + + + modules\turn + + + modules\uuid + + + modules\vidbridge + + + modules\vidbridge + + + modules\vidbridge + + + modules\vidloop + + + modules\vumeter + + + modules\wincons + + + modules\winwave + + + modules\winwave + + + modules\winwave + + + \ No newline at end of file diff --git a/mk/win32/static.c b/mk/win32/static.c index 9b6d428..4d67d9e 100644 --- a/mk/win32/static.c +++ b/mk/win32/static.c @@ -7,7 +7,6 @@ extern const struct mod_export exports_wincons; extern const struct mod_export exports_g711; extern const struct mod_export exports_winwave; extern const struct mod_export exports_dshow; -extern const struct mod_export exports_avcodec; extern const struct mod_export exports_account; extern const struct mod_export exports_contact; extern const struct mod_export exports_menu; @@ -22,7 +21,6 @@ extern const struct mod_export exports_vumeter; const struct mod_export *mod_table[] = { &exports_wincons, - &exports_avcodec, &exports_g711, &exports_winwave, &exports_dshow, diff --git a/modules/dshow/dshow.cpp b/modules/dshow/dshow.cpp index 0c0066f..df84ee9 100644 --- a/modules/dshow/dshow.cpp +++ b/modules/dshow/dshow.cpp @@ -12,6 +12,8 @@ #include #include +#pragma comment(lib, "strmiids.lib") + /** * @defgroup dshow dshow @@ -43,10 +45,11 @@ IID IID_ISampleGrabberCB = { #include "qedit.h" +/* const CLSID CLSID_SampleGrabber = { 0xc1f400a0, 0x3f08, 0x11d3, { 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37 } }; - +*/ class Grabber; -- cgit v1.2.3