Commit f2fe07dd authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix compilation on Windows desktop.

parent c382a9c5
......@@ -28,7 +28,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110_wp80</PlatformToolset>
<PlatformToolset>v110</PlatformToolset>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
......@@ -41,7 +41,7 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v110_wp80</PlatformToolset>
<PlatformToolset>v110</PlatformToolset>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
......@@ -57,7 +57,7 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)\</OutDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)\</IntDir>
</PropertyGroup>
<PropertyGroup>
......@@ -80,7 +80,7 @@
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>ws2_32.lib;ortp_dll.lib;gsm_dll.lib;speex_dll.lib;speexdsp_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\oRTP\;$(SolutionDir)$(Platform)\$(Configuration)\gsm\;$(SolutionDir)$(Platform)\$(Configuration)\speex\;$(SolutionDir)$(Platform)\$(Configuration)\speexdsp\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(TargetDir)$(TargetName)_dll.lib</ImportLibrary>
</Link>
<CustomBuildStep>
......@@ -106,7 +106,7 @@
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>ws2_32.lib;ortp_dll.lib;gsm_dll.lib;speex_dll.lib;speexdsp_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\oRTP\;$(SolutionDir)$(Platform)\$(Configuration)\gsm\;$(SolutionDir)$(Platform)\$(Configuration)\speex\;$(SolutionDir)$(Platform)\$(Configuration)\speexdsp\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(TargetDir)$(TargetName)_dll.lib</ImportLibrary>
</Link>
<CustomBuildStep>
......@@ -130,7 +130,7 @@
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>ws2_32.lib;ortp_dll.lib;gsm_dll.lib;speex_dll.lib;speexdsp_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\oRTP\;$(SolutionDir)$(Platform)\$(Configuration)\gsm\;$(SolutionDir)$(Platform)\$(Configuration)\speex\;$(SolutionDir)$(Platform)\$(Configuration)\speexdsp\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(TargetDir)$(TargetName)_dll.lib</ImportLibrary>
</Link>
<CustomBuildStep>
......@@ -156,14 +156,14 @@
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>ws2_32.lib;ortp_dll.lib;gsm_dll.lib;speex_dll.lib;speexdsp_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\oRTP\;$(SolutionDir)$(Platform)\$(Configuration)\gsm\;$(SolutionDir)$(Platform)\$(Configuration)\speex\;$(SolutionDir)$(Platform)\$(Configuration)\speexdsp\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(TargetDir)$(TargetName)_dll.lib</ImportLibrary>
</Link>
<CustomBuildStep>
<Outputs>$(TargetDir)$(TargetName)_dll.lib;%(Outputs)</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ItemGroup Condition="'$(Platform)'=='ARM'">
<Reference Include="Windows">
<IsWinMDFile>true</IsWinMDFile>
</Reference>
......@@ -248,7 +248,7 @@
<ClCompile Include="..\..\..\..\src\voip\ringstream.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" Condition="'$(Platform)'=='ARM'" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
......@@ -85,7 +85,7 @@ int ms_discover_mtu(const char *host)
if (!m_IcmpInst)
{
#if WINAPI_FAMILY_APP
#ifdef WINAPI_FAMILY_PHONE_APP
m_IcmpInst = LoadPackagedLibrary(L"icmp", 0);
#else
m_IcmpInst = LoadLibrary("icmp.dll");
......
......@@ -124,7 +124,7 @@ int mediastreamer2_tester_run_tests(const char *suite_name, const char *test_nam
}
#if !WINAPI_FAMILY_APP
#ifndef WINAPI_FAMILY_PHONE_APP
int main (int argc, char *argv[]) {
int i;
char *suite_name = NULL;
......@@ -134,7 +134,9 @@ int main (int argc, char *argv[]) {
for(i = 1; i < argc; ++i) {
if (strcmp(argv[i], "--help") == 0) {
fprintf(stderr, "%s \t--help\n"
#ifndef _WIN32
"\t\t\t--verbose\n"
#endif
#if HAVE_CU_GET_SUITE
"\t\t\t--suite <suite name>\n"
"\t\t\t--test <test name>\n"
......@@ -164,11 +166,13 @@ int main (int argc, char *argv[]) {
#endif
}
#ifndef _WIN32
if (verbose) {
setenv("MEDIASTREAMER_DEBUG", "1", 1);
} else {
unsetenv("MEDIASTREAMER_DEBUG");
}
#endif
return mediastreamer2_tester_run_tests(suite_name, test_name);
}
......
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