diff options
Diffstat (limited to 'mk')
-rw-r--r-- | mk/Doxyfile | 2 | ||||
-rw-r--r-- | mk/modules.mk | 10 | ||||
-rw-r--r-- | mk/win32/baresip.sln | 9 | ||||
-rw-r--r-- | mk/win32/baresip.vcxproj | 19 | ||||
-rw-r--r-- | mk/win32/baresip.vcxproj.filters | 5 |
5 files changed, 29 insertions, 16 deletions
diff --git a/mk/Doxyfile b/mk/Doxyfile index 3606286..1697721 100644 --- a/mk/Doxyfile +++ b/mk/Doxyfile @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = baresip -PROJECT_NUMBER = 0.5.7 +PROJECT_NUMBER = 0.5.9 OUTPUT_DIRECTORY = ../baresip-dox CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/mk/modules.mk b/mk/modules.mk index 9211dfd..a479e6a 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -171,11 +171,6 @@ USE_MPA := $(shell [ -f $(SYSROOT)/include/twolame.h ] || \ [ -f $(SYSROOT_ALT)/include/twolame.h ] && echo "yes") endif endif -USE_SPEEX := $(shell [ -f $(SYSROOT)/include/speex.h ] || \ - [ -f $(SYSROOT)/include/speex/speex.h ] || \ - [ -f $(SYSROOT)/local/include/speex.h ] || \ - [ -f $(SYSROOT)/local/include/speex/speex.h ] || \ - [ -f $(SYSROOT_ALT)/include/speex/speex.h ] && echo "yes") USE_SPEEX_AEC := $(shell [ -f $(SYSROOT)/include/speex/speex_echo.h ] || \ [ -f $(SYSROOT)/local/include/speex/speex_echo.h ] || \ [ -f $(SYSROOT_ALT)/include/speex/speex_echo.h ] && echo "yes") @@ -275,6 +270,7 @@ MODULES += menu contact vumeter mwi account natpmp httpd MODULES += srtp MODULES += uuid MODULES += debug_cmd +MODULES += ctrl_tcp ifneq ($(HAVE_LIBMQTT),) MODULES += mqtt @@ -285,10 +281,8 @@ MODULES += aubridge aufile endif ifneq ($(USE_VIDEO),) MODULES += vidloop selfview vidbridge -ifneq ($(HAVE_PTHREAD),) MODULES += fakevideo endif -endif ifneq ($(USE_ALSA),) @@ -308,10 +302,10 @@ MODULES += avcodec ifneq ($(USE_AVFORMAT),) MODULES += avformat endif +endif ifneq ($(USE_AVAHI),) MODULES += avahi endif -endif ifneq ($(USE_BV32),) MODULES += bv32 endif diff --git a/mk/win32/baresip.sln b/mk/win32/baresip.sln index 7c791e8..a448d34 100644 --- a/mk/win32/baresip.sln +++ b/mk/win32/baresip.sln @@ -1,6 +1,8 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.10 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baresip-win32", "baresip.vcxproj", "{4B89C2D8-FB32-4D7C-9019-752A5664781C}" ProjectSection(ProjectDependencies) = postProject {3E767371-A72B-4F5C-A695-8F844B0889C5} = {3E767371-A72B-4F5C-A695-8F844B0889C5} @@ -36,4 +38,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8F3E56DF-4B18-4499-B228-37DC5DC474F9} + EndGlobalSection EndGlobal diff --git a/mk/win32/baresip.vcxproj b/mk/win32/baresip.vcxproj index c321b5f..c561e77 100644 --- a/mk/win32/baresip.vcxproj +++ b/mk/win32/baresip.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -46,11 +46,14 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(Platform)\$(Configuration)\tmp\mk\win32\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <CodeAnalysisRuleSet>BasicDesignGuidelineRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>include;..\..\include;..\..\..\re\include;..\..\..\rem\include;..\..\..\misc;..\..\..\dirent\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;STATIC;HAVE_IO_H;HAVE_SELECT;USE_VIDEO;_CRT_SECURE_NO_DEPRECATE;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;STATIC;HAVE_IO_H;HAVE_SELECT;USE_VIDEO;_CRT_SECURE_NO_DEPRECATE;FD_SETSIZE=1024;SHARE_PATH="/usr/share/baresip";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -61,6 +64,7 @@ <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4142;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ObjectFileName>$(IntDir)%(RelativeDir)%(Filename).obj</ObjectFileName>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<AdditionalOptions>winmm.lib ..\..\..\re\$(Platform)\$(Configuration)\bin\re-win32.lib ..\..\..\rem\$(Platform)\$(Configuration)\bin\rem-win32.lib %(AdditionalOptions)</AdditionalOptions>
@@ -70,13 +74,13 @@ <ProgramDatabaseFile>$(OutDir)baresip-win32.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>include;..\..\include;..\..\..\re\include;..\..\..\rem\include;..\..\..\misc;..\..\..\dirent\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;STATIC;HAVE_IO_H;HAVE_SELECT;USE_VIDEO;_CRT_SECURE_NO_DEPRECATE;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;STATIC;HAVE_IO_H;HAVE_SELECT;USE_VIDEO;_CRT_SECURE_NO_DEPRECATE;FD_SETSIZE=1024;SHARE_PATH="/usr/share/baresip";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -94,7 +98,7 @@ <OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -197,6 +201,11 @@ <ClCompile Include="..\..\src\vidisp.c" />
<ClCompile Include="..\..\src\vidsrc.c" />
<ClCompile Include="static.c" />
+ <ClCompile Include="..\..\src\rtpext.c" />
+ <ClCompile Include="..\..\src\timestamp.c" />
+ <ClCompile Include="..\..\src\aulevel.c" />
+ <ClCompile Include="..\..\src\vidutil.c" />
+ <ClCompile Include="..\..\src\event.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/mk/win32/baresip.vcxproj.filters b/mk/win32/baresip.vcxproj.filters index 5098a2b..26999f5 100644 --- a/mk/win32/baresip.vcxproj.filters +++ b/mk/win32/baresip.vcxproj.filters @@ -362,5 +362,10 @@ <ClCompile Include="..\..\modules\winwave\winwave.c">
<Filter>modules\winwave</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\rtpext.c" />
+ <ClCompile Include="..\..\src\timestamp.c" />
+ <ClCompile Include="..\..\src\aulevel.c" />
+ <ClCompile Include="..\..\src\vidutil.c" />
+ <ClCompile Include="..\..\src\event.c" />
</ItemGroup>
</Project>
\ No newline at end of file |