Commit 843ae9c9 authored by Ghislain MARY's avatar Ghislain MARY

Fix build of ms2-tester for Windows 10.

parent 01abe0e7
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'"> <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
<ClCompile> <ClCompile>
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
<ClCompile Include="..\..\..\..\tester\mediastreamer2_sound_card_tester.c" /> <ClCompile Include="..\..\..\..\tester\mediastreamer2_sound_card_tester.c" />
<ClCompile Include="..\..\..\..\tester\mediastreamer2_tester.c" /> <ClCompile Include="..\..\..\..\tester\mediastreamer2_tester.c" />
<ClCompile Include="..\..\..\..\tester\mediastreamer2_tester_private.c" /> <ClCompile Include="..\..\..\..\tester\mediastreamer2_tester_private.c" />
<ClCompile Include="..\..\..\..\tester\mediastreamer2_text_stream_tester.c" />
<ClCompile Include="..\..\..\..\tester\mediastreamer2_video_stream_tester.c" /> <ClCompile Include="..\..\..\..\tester\mediastreamer2_video_stream_tester.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
...@@ -91,6 +92,7 @@ ...@@ -91,6 +92,7 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<GenerateManifest>false</GenerateManifest> <GenerateManifest>false</GenerateManifest>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
......
...@@ -1255,7 +1255,7 @@ MS2_PUBLIC void text_stream_iterate(TextStream *stream); ...@@ -1255,7 +1255,7 @@ MS2_PUBLIC void text_stream_iterate(TextStream *stream);
* @param[in] stream TextStream object previously created with text_stream_new(). * @param[in] stream TextStream object previously created with text_stream_new().
* @return the character read or '\0' if there are no more character to read in the steam. * @return the character read or '\0' if there are no more character to read in the steam.
**/ **/
char text_stream_getchar(TextStream *stream); MS2_PUBLIC char text_stream_getchar(TextStream *stream);
/** /**
* Writes a character to the stream. * Writes a character to the stream.
...@@ -1264,7 +1264,7 @@ char text_stream_getchar(TextStream *stream); ...@@ -1264,7 +1264,7 @@ char text_stream_getchar(TextStream *stream);
* @param[in] stream TextStream object previously created with text_stream_new(). * @param[in] stream TextStream object previously created with text_stream_new().
* @param[in] c the Char to send. * @param[in] c the Char to send.
**/ **/
void text_stream_putchar(TextStream *stream, const char c); MS2_PUBLIC void text_stream_putchar(TextStream *stream, const char c);
/** /**
* Reads a character from the stream in UTF-32 format. * Reads a character from the stream in UTF-32 format.
...@@ -1272,7 +1272,7 @@ void text_stream_putchar(TextStream *stream, const char c); ...@@ -1272,7 +1272,7 @@ void text_stream_putchar(TextStream *stream, const char c);
* @param[in] stream TextStream object previously created with text_stream_new(). * @param[in] stream TextStream object previously created with text_stream_new().
* @return the character in UTF-32 format. * @return the character in UTF-32 format.
**/ **/
uint32_t text_stream_getchar32(TextStream *stream); MS2_PUBLIC uint32_t text_stream_getchar32(TextStream *stream);
/** /**
* Writes a character to stream in UTF-32 format. * Writes a character to stream in UTF-32 format.
...@@ -1280,7 +1280,7 @@ uint32_t text_stream_getchar32(TextStream *stream); ...@@ -1280,7 +1280,7 @@ uint32_t text_stream_getchar32(TextStream *stream);
* @param[in] stream TextStream object previously created with text_stream_new(). * @param[in] stream TextStream object previously created with text_stream_new().
* @param[in] i the Char in UTF-32 format. * @param[in] i the Char in UTF-32 format.
**/ **/
void text_stream_putchar32(TextStream *stream, uint32_t i); MS2_PUBLIC void text_stream_putchar32(TextStream *stream, uint32_t i);
/** /**
* @} * @}
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
#ifndef snprintf #ifndef snprintf
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
#ifndef strdup
#define strdup _strdup
#endif
#endif #endif
extern int bc_printf_verbosity_info; extern int bc_printf_verbosity_info;
......
...@@ -119,7 +119,7 @@ void MS2Tester::runAllToXml() ...@@ -119,7 +119,7 @@ void MS2Tester::runAllToXml()
init(true); init(true);
FILE *f = fopen(logFile, "w"); FILE *f = fopen(logFile, "w");
ortp_set_log_file(f); ortp_set_log_file(f);
bc_tester_start(); bc_tester_start("ms2-tester");
bc_tester_uninit(); bc_tester_uninit();
fclose(f); fclose(f);
free(xmlFile); free(xmlFile);
......
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