Move from CUnit to BCUnit

parent ba0fd421
......@@ -2,7 +2,7 @@
#include "mediastreamer2-tester-native.h"
#include "ortp/logging.h"
#include "cunit/Util.h"
#include "bcunit/Util.h"
using namespace Windows::Phone::Media::Devices;
using namespace Windows::Phone::Networking::Voip;
......@@ -28,7 +28,7 @@ static void nativeOutputTraceHandler(OutputTraceLevel lev, const char *fmt, va_l
}
}
static void CUnitNativeOutputTraceHandler(int lev, const char *fmt, va_list args)
static void BCUnitNativeOutputTraceHandler(int lev, const char *fmt, va_list args)
{
nativeOutputTraceHandler(Raw, fmt, args);
}
......@@ -79,7 +79,7 @@ void Mediastreamer2TesterNative::run(Platform::String^ suiteName, Platform::Stri
ortp_set_log_level_mask(ORTP_ERROR|ORTP_FATAL);
}
ortp_set_log_handler(Mediastreamer2NativeOutputTraceHandler);
CU_set_trace_handler(CUnitNativeOutputTraceHandler);
CU_set_trace_handler(BCUnitNativeOutputTraceHandler);
// Need to create a dummy VoipPhoneCall to be able to capture audio!
Platform::String^ str = "Mediastreamer2";
......
......@@ -48,7 +48,7 @@
<ItemDefinitionGroup>
<ClCompile>
<WarningLevel>Level4</WarningLevel>
<AdditionalIncludeDirectories>$(ProjectDir);$(GeneratedFilesDir);$(IntDir);$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\src;$(ProjectDir)..\..\..\src\voip;$(ProjectDir)..\..\..\tester;$(ProjectDir)..\..\..\..\ortp\include;$(ProjectDir)..\..\..\..\..\cunit\build\wp8\cunit\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir);$(GeneratedFilesDir);$(IntDir);$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\src;$(ProjectDir)..\..\..\src\voip;$(ProjectDir)..\..\..\tester;$(ProjectDir)..\..\..\..\ortp\include;$(ProjectDir)..\..\..\..\..\bcunit\build\wp8\bcunit\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;HAVE_CU_GET_SUITE;VIDEO_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
......@@ -116,7 +116,7 @@
<ProjectReference Include="..\..\..\..\..\bcg729\build\wp8\bcg729\bcg729.vcxproj">
<Project>{1db09afe-fc9b-472e-a746-0e33f8ef8883}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\cunit\build\wp8\cunit\cunit.vcxproj">
<ProjectReference Include="..\..\..\..\..\bcunit\build\wp8\bcunit\bcunit.vcxproj">
<Project>{902daf1d-ebf1-4d03-b598-143500a50ab4}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\msamr\build\wp8\msamr\msamr.vcxproj">
......
......@@ -20,7 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediastreamer2-tester-nativ
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883} = {1DB09AFE-FC9B-472E-A746-0E33F8EF8883}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cunit", "..\..\..\..\..\cunit\build\wp8\cunit\cunit.vcxproj", "{902DAF1D-EBF1-4D03-B598-143500A50AB4}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bcunit", "..\..\..\..\..\bcunit\build\wp8\bcunit\bcunit.vcxproj", "{902DAF1D-EBF1-4D03-B598-143500A50AB4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediastreamer2", "..\mediastreamer2\mediastreamer2.vcxproj", "{027BAD0E-9179-48C1-9733-7AA7E2C2EC70}"
ProjectSection(ProjectDependencies) = postProject
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment