![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 5539
- Timestamp:
- Jan 23, 2017 4:32:34 AM (8 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 55 edited
- 16 copied
-
. (modified) (2 props)
-
build/vs/pjproject-vs14-api-def.props (copied) (copied from pjproject/branches/projects/uwp/build/vs/pjproject-vs14-api-def.props)
-
build/vs/pjproject-vs14-arm-common-defaults.props (copied) (copied from pjproject/branches/projects/uwp/build/vs/pjproject-vs14-arm-common-defaults.props)
-
build/vs/pjproject-vs14-arm-release-defaults.props (copied) (copied from pjproject/branches/projects/uwp/build/vs/pjproject-vs14-arm-release-defaults.props)
-
build/vs/pjproject-vs14-build-targets.targets (copied) (copied from pjproject/branches/projects/uwp/build/vs/pjproject-vs14-build-targets.targets)
-
build/vs/pjproject-vs14-common-config.props (copied) (copied from pjproject/branches/projects/uwp/build/vs/pjproject-vs14-common-config.props)
-
build/vs/pjproject-vs14-common-defaults.props (modified) (2 diffs)
-
build/vs/pjproject-vs14-common-targets.targets (copied) (copied from pjproject/branches/projects/uwp/build/vs/pjproject-vs14-common-targets.targets)
-
build/vs/pjproject-vs14-win32-common-defaults.props (modified) (2 diffs)
-
build/vs/pjproject-vs14-win64-common-defaults.props (modified) (2 diffs)
-
pjlib-util/build/pjlib_util.vcxproj (modified) (21 diffs)
-
pjlib-util/build/pjlib_util_test.vcxproj (modified) (3 diffs)
-
pjlib/build/pjlib.vcxproj (modified) (40 diffs)
-
pjlib/build/pjlib.vcxproj.filters (modified) (5 diffs)
-
pjlib/build/pjlib_test.vcxproj (modified) (21 diffs)
-
pjlib/build/pjlib_test.vcxproj.filters (modified) (1 diff)
-
pjlib/include/pj/compat/os_winphone8.h (copied) (copied from pjproject/branches/projects/uwp/pjlib/include/pj/compat/os_winphone8.h)
-
pjlib/include/pj/compat/os_winuwp.h (copied) (copied from pjproject/branches/projects/uwp/pjlib/include/pj/compat/os_winuwp.h)
-
pjlib/include/pj/config.h (modified) (2 diffs)
-
pjlib/src/pj/file_access_win32.c (modified) (5 diffs)
-
pjlib/src/pj/file_io_win32.c (modified) (7 diffs)
-
pjlib/src/pj/ioqueue_common_abs.c (modified) (1 diff)
-
pjlib/src/pj/ioqueue_common_abs.h (modified) (1 diff)
-
pjlib/src/pj/ioqueue_select.c (modified) (1 diff)
-
pjlib/src/pj/ioqueue_uwp.cpp (copied) (copied from pjproject/branches/projects/uwp/pjlib/src/pj/ioqueue_uwp.cpp)
-
pjlib/src/pj/ip_helper_winphone8.c (copied) (copied from pjproject/branches/projects/uwp/pjlib/src/pj/ip_helper_winphone8.c)
-
pjlib/src/pj/os_core_win32.c (modified) (19 diffs)
-
pjlib/src/pj/os_info.c (modified) (5 diffs)
-
pjlib/src/pj/sock_uwp.cpp (copied) (copied from pjproject/branches/projects/uwp/pjlib/src/pj/sock_uwp.cpp)
-
pjlib/src/pj/sock_uwp.h (copied) (copied from pjproject/branches/projects/uwp/pjlib/src/pj/sock_uwp.h)
-
pjmedia/build/pjmedia.vcxproj (modified) (27 diffs)
-
pjmedia/build/pjmedia_audiodev.vcxproj (modified) (21 diffs)
-
pjmedia/build/pjmedia_audiodev.vcxproj.filters (modified) (1 diff)
-
pjmedia/build/pjmedia_codec.vcxproj (modified) (26 diffs)
-
pjmedia/build/pjmedia_test.vcxproj (modified) (3 diffs)
-
pjmedia/build/pjmedia_videodev.vcxproj (modified) (21 diffs)
-
pjmedia/include/pjmedia-audiodev/config.h (modified) (1 diff)
-
pjmedia/include/pjmedia-audiodev/errno.h (modified) (1 diff)
-
pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (5 diffs)
-
pjmedia/src/pjmedia-audiodev/wasapi_dev.cpp (copied) (copied from pjproject/branches/projects/uwp/pjmedia/src/pjmedia-audiodev/wasapi_dev.cpp)
-
pjmedia/src/pjmedia/transport_udp.c (modified) (2 diffs)
-
pjnath/build/pjnath.vcxproj (modified) (29 diffs)
-
pjnath/build/pjnath_test.vcxproj (modified) (3 diffs)
-
pjproject-vs14.sln (modified) (4 diffs)
-
pjsip-apps/build/libpjproject.vcxproj (modified) (26 diffs)
-
pjsip-apps/build/pjsua.vcxproj (modified) (28 diffs)
-
pjsip-apps/build/pjsua.vcxproj.filters (modified) (1 diff)
-
pjsip-apps/build/pjsystest.vcxproj (modified) (3 diffs)
-
pjsip-apps/build/sample_debug.vcxproj (modified) (3 diffs)
-
pjsip-apps/build/samples.vcxproj (modified) (4 diffs)
-
pjsip-apps/src/pjsua/winrt (copied) (copied from pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/winrt)
-
pjsip/build/pjsip_core.vcxproj (modified) (22 diffs)
-
pjsip/build/pjsip_simple.vcxproj (modified) (20 diffs)
-
pjsip/build/pjsip_test.vcxproj (modified) (3 diffs)
-
pjsip/build/pjsip_ua.vcxproj (modified) (21 diffs)
-
pjsip/build/pjsua2_lib.vcxproj (modified) (20 diffs)
-
pjsip/build/pjsua_lib.vcxproj (modified) (20 diffs)
-
third_party/build/baseclasses/libbaseclasses.vcxproj (modified) (27 diffs)
-
third_party/build/g7221/libg7221codec.vcxproj (modified) (28 diffs)
-
third_party/build/gsm/libgsmcodec.vcxproj (modified) (23 diffs)
-
third_party/build/ilbc/libilbccodec.vcxproj (modified) (22 diffs)
-
third_party/build/milenage/libmilenage.vcxproj (modified) (23 diffs)
-
third_party/build/portaudio (copied) (copied from pjproject/branches/projects/uwp/third_party/build/portaudio)
-
third_party/build/resample/libresample.vcxproj (modified) (23 diffs)
-
third_party/build/speex/libspeex.vcxproj (modified) (30 diffs)
-
third_party/build/srtp/libsrtp.vcxproj (modified) (27 diffs)
-
third_party/build/webrtc/libwebrtc.vcxproj (modified) (3 diffs)
-
third_party/build/yuv/libyuv.vcxproj (modified) (4 diffs)
-
third_party/build/yuv/libyuv.vcxproj.filters (modified) (1 diff)
-
third_party/threademulation (copied) (copied from pjproject/branches/projects/uwp/third_party/threademulation)
-
third_party/yuv/source/cpu_id.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
- Property svn:mergeinfo changed
/pjproject/branches/projects/uwp (added) merged: 5208,5210-5211,5254,5256,5298,5439,5470,5497,5511-5515,5526,5528-5529,5532,5538 -
Property
svn:global-ignores
set to
bin
obj
lib
Bin
output
Debug
Generated[^A-Ba-b0-9]Files
Service[^A-Ba-b0-9]References
*.opendb
*.db
*.user
- Property svn:mergeinfo changed
-
pjproject/trunk/build/vs/pjproject-vs14-common-defaults.props
r5169 r5539 19 19 <WarningLevel>Level4</WarningLevel> 20 20 <CompileAs>Default</CompileAs> 21 <CompileAsWinRT>false</CompileAsWinRT> 22 <PrecompiledHeader>NotUsing</PrecompiledHeader> 23 <SDLCheck>false</SDLCheck> 21 24 </ClCompile> 22 25 <Lib> … … 24 27 </Lib> 25 28 <Link> 26 <OutputFile>..\bin\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 29 <OutputFile Condition="'$(TargetExt)'=='.exe'">..\bin\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 30 <GenerateWindowsMetadata Condition="'$(TargetExt)'=='.lib'">false</GenerateWindowsMetadata> 27 31 </Link> 28 32 </ItemDefinitionGroup> -
pjproject/trunk/build/vs/pjproject-vs14-win32-common-defaults.props
r5168 r5539 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 <ImportGroup Label="PropertySheets"> 3 <ImportGroup Label="PropertySheets"> 4 4 </ImportGroup> 5 5 <PropertyGroup Label="UserMacros"> … … 10 10 </PropertyGroup> 11 11 <ItemDefinitionGroup> 12 <ClCompile>13 <PreprocessorDefinitions>WIN32;PJ_WIN32=1;PJ_M_I386=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>14 </ClCompile>15 12 <Link> 16 13 <SubSystem>Console</SubSystem> -
pjproject/trunk/build/vs/pjproject-vs14-win64-common-defaults.props
r5168 r5539 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 <ImportGroup Label="PropertySheets"> 3 <ImportGroup Label="PropertySheets"> 4 4 </ImportGroup> 5 5 <PropertyGroup Label="UserMacros"> … … 10 10 </PropertyGroup> 11 11 <ItemDefinitionGroup> 12 <ClCompile>13 <PreprocessorDefinitions>WIN64;PJ_WIN64=1;PJ_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>14 </ClCompile>15 12 <Link> 16 13 <SubSystem>Console</SubSystem> -
pjproject/trunk/pjlib-util/build/pjlib_util.vcxproj
r5168 r5539 2 2 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <ItemGroup Label="ProjectConfigurations"> 4 <ProjectConfiguration Include="Debug-Dynamic|ARM"> 5 <Configuration>Debug-Dynamic</Configuration> 6 <Platform>ARM</Platform> 7 </ProjectConfiguration> 4 8 <ProjectConfiguration Include="Debug-Dynamic|Win32"> 5 9 <Configuration>Debug-Dynamic</Configuration> … … 10 14 <Platform>x64</Platform> 11 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Debug-Static|ARM"> 17 <Configuration>Debug-Static</Configuration> 18 <Platform>ARM</Platform> 19 </ProjectConfiguration> 12 20 <ProjectConfiguration Include="Debug-Static|Win32"> 13 21 <Configuration>Debug-Static</Configuration> … … 18 26 <Platform>x64</Platform> 19 27 </ProjectConfiguration> 28 <ProjectConfiguration Include="Debug|ARM"> 29 <Configuration>Debug</Configuration> 30 <Platform>ARM</Platform> 31 </ProjectConfiguration> 20 32 <ProjectConfiguration Include="Debug|Win32"> 21 33 <Configuration>Debug</Configuration> … … 26 38 <Platform>x64</Platform> 27 39 </ProjectConfiguration> 40 <ProjectConfiguration Include="Release-Dynamic|ARM"> 41 <Configuration>Release-Dynamic</Configuration> 42 <Platform>ARM</Platform> 43 </ProjectConfiguration> 28 44 <ProjectConfiguration Include="Release-Dynamic|Win32"> 29 45 <Configuration>Release-Dynamic</Configuration> … … 34 50 <Platform>x64</Platform> 35 51 </ProjectConfiguration> 52 <ProjectConfiguration Include="Release-Static|ARM"> 53 <Configuration>Release-Static</Configuration> 54 <Platform>ARM</Platform> 55 </ProjectConfiguration> 36 56 <ProjectConfiguration Include="Release-Static|Win32"> 37 57 <Configuration>Release-Static</Configuration> … … 42 62 <Platform>x64</Platform> 43 63 </ProjectConfiguration> 64 <ProjectConfiguration Include="Release|ARM"> 65 <Configuration>Release</Configuration> 66 <Platform>ARM</Platform> 67 </ProjectConfiguration> 44 68 <ProjectConfiguration Include="Release|Win32"> 45 69 <Configuration>Release</Configuration> … … 51 75 </ProjectConfiguration> 52 76 </ItemGroup> 77 <!-- Import common config --> 78 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 79 <PropertyGroup Label="Globals"> 54 80 <ProjectGuid>{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}</ProjectGuid> 55 <RootNamespace>pjlib_util</RootNamespace> 81 <RootNamespace>pjlib_util</RootNamespace> 82 <!-- Specific UWP property --> 83 <DefaultLanguage>en-US</DefaultLanguage> 56 84 </PropertyGroup> 57 85 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 62 90 <CharacterSet>MultiByte</CharacterSet> 63 91 </PropertyGroup> 92 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 93 <ConfigurationType>StaticLibrary</ConfigurationType> 94 <PlatformToolset>v140</PlatformToolset> 95 <UseOfMfc>false</UseOfMfc> 96 <CharacterSet>MultiByte</CharacterSet> 97 </PropertyGroup> 64 98 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 65 99 <ConfigurationType>StaticLibrary</ConfigurationType> … … 68 102 <CharacterSet>MultiByte</CharacterSet> 69 103 </PropertyGroup> 104 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 105 <ConfigurationType>StaticLibrary</ConfigurationType> 106 <PlatformToolset>v140</PlatformToolset> 107 <UseOfMfc>false</UseOfMfc> 108 <CharacterSet>MultiByte</CharacterSet> 109 </PropertyGroup> 70 110 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 71 111 <ConfigurationType>StaticLibrary</ConfigurationType> … … 74 114 <CharacterSet>MultiByte</CharacterSet> 75 115 </PropertyGroup> 116 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 117 <ConfigurationType>StaticLibrary</ConfigurationType> 118 <PlatformToolset>v140</PlatformToolset> 119 <UseOfMfc>false</UseOfMfc> 120 <CharacterSet>MultiByte</CharacterSet> 121 </PropertyGroup> 76 122 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 77 123 <ConfigurationType>StaticLibrary</ConfigurationType> … … 80 126 <CharacterSet>MultiByte</CharacterSet> 81 127 </PropertyGroup> 128 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 129 <ConfigurationType>StaticLibrary</ConfigurationType> 130 <PlatformToolset>v140</PlatformToolset> 131 <UseOfMfc>false</UseOfMfc> 132 <CharacterSet>MultiByte</CharacterSet> 133 </PropertyGroup> 82 134 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 83 135 <ConfigurationType>StaticLibrary</ConfigurationType> … … 86 138 <CharacterSet>MultiByte</CharacterSet> 87 139 </PropertyGroup> 140 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 141 <ConfigurationType>StaticLibrary</ConfigurationType> 142 <PlatformToolset>v140</PlatformToolset> 143 <UseOfMfc>false</UseOfMfc> 144 <CharacterSet>MultiByte</CharacterSet> 145 </PropertyGroup> 88 146 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 89 147 <ConfigurationType>StaticLibrary</ConfigurationType> … … 92 150 <CharacterSet>MultiByte</CharacterSet> 93 151 </PropertyGroup> 152 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 153 <ConfigurationType>StaticLibrary</ConfigurationType> 154 <PlatformToolset>v140</PlatformToolset> 155 <UseOfMfc>false</UseOfMfc> 156 <CharacterSet>MultiByte</CharacterSet> 157 </PropertyGroup> 94 158 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 95 159 <ConfigurationType>StaticLibrary</ConfigurationType> … … 127 191 <UseOfMfc>false</UseOfMfc> 128 192 <CharacterSet>MultiByte</CharacterSet> 193 </PropertyGroup> 194 <!-- Override the PlatformToolset --> 195 <PropertyGroup> 196 <PlatformToolset>$(BuildToolset)</PlatformToolset> 197 <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 129 198 </PropertyGroup> 130 199 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 131 200 <ImportGroup Label="ExtensionSettings"> 132 201 </ImportGroup> 133 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 134 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 135 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 136 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 202 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 203 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 204 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 205 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 206 </ImportGroup> 207 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 208 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 209 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 210 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 137 211 </ImportGroup> 138 212 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 139 213 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 140 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 141 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 214 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 215 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 216 </ImportGroup> 217 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 218 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 219 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 220 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 142 221 </ImportGroup> 143 222 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 144 223 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 145 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 146 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 224 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 225 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 226 </ImportGroup> 227 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 228 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 229 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 230 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 147 231 </ImportGroup> 148 232 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 149 233 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 150 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 151 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 234 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 235 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 236 </ImportGroup> 237 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 238 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 239 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 240 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 152 241 </ImportGroup> 153 242 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 154 243 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 155 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 156 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 244 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 245 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 246 </ImportGroup> 247 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 248 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 249 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 250 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 157 251 </ImportGroup> 158 252 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 159 253 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 160 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 161 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 254 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 255 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 256 </ImportGroup> 257 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 258 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 259 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 260 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 162 261 </ImportGroup> 163 262 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 164 263 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 165 166 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 264 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 265 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 167 266 </ImportGroup> 168 267 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 169 268 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 170 171 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 269 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 270 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 172 271 </ImportGroup> 173 272 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 174 273 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 175 176 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 274 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 275 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 177 276 </ImportGroup> 178 277 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 179 278 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 180 181 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 279 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 280 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 182 281 </ImportGroup> 183 282 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 184 283 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 185 186 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 284 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 285 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 187 286 </ImportGroup> 188 287 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 189 288 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 190 191 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 289 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 290 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 192 291 </ImportGroup> 193 292 <PropertyGroup Label="UserMacros" /> 194 293 <PropertyGroup> 195 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 196 <TargetName>pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 197 </PropertyGroup> 294 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 295 <TargetName>pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 296 </PropertyGroup> 297 <!-- Compile and link option definition --> 298 <ItemDefinitionGroup> 299 <ClCompile> 300 <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 301 </ClCompile> 302 </ItemDefinitionGroup> 198 303 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 199 304 <ClCompile> … … 201 306 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 202 307 <PrecompiledHeaderOutputFile /> 308 </ClCompile> 309 <Lib> 310 <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 311 </Lib> 312 </ItemDefinitionGroup> 313 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 314 <ClCompile> 315 <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 316 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 317 <PrecompiledHeaderOutputFile> 318 </PrecompiledHeaderOutputFile> 203 319 </ClCompile> 204 320 <Lib> … … 229 345 </Lib> 230 346 </ItemDefinitionGroup> 347 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 348 <ClCompile> 349 <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 350 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 351 <PrecompiledHeaderOutputFile> 352 </PrecompiledHeaderOutputFile> 353 </ClCompile> 354 <Lib> 355 <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 356 </Lib> 357 </ItemDefinitionGroup> 231 358 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 232 359 <Midl> … … 253 380 </Lib> 254 381 </ItemDefinitionGroup> 382 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 383 <ClCompile> 384 <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 385 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 386 <PrecompiledHeaderOutputFile> 387 </PrecompiledHeaderOutputFile> 388 </ClCompile> 389 <Lib> 390 <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 391 </Lib> 392 </ItemDefinitionGroup> 255 393 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 256 394 <Midl> … … 277 415 </Lib> 278 416 </ItemDefinitionGroup> 417 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 418 <ClCompile> 419 <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 420 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 421 <PrecompiledHeaderOutputFile> 422 </PrecompiledHeaderOutputFile> 423 </ClCompile> 424 <Lib> 425 <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 426 </Lib> 427 </ItemDefinitionGroup> 279 428 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 280 429 <Midl> … … 300 449 </Lib> 301 450 </ItemDefinitionGroup> 451 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 452 <ClCompile> 453 <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 454 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 455 <PrecompiledHeaderOutputFile> 456 </PrecompiledHeaderOutputFile> 457 </ClCompile> 458 <Lib> 459 <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 460 </Lib> 461 </ItemDefinitionGroup> 302 462 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 303 463 <Midl> … … 319 479 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 320 480 <PrecompiledHeaderOutputFile /> 481 </ClCompile> 482 <Lib> 483 <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 484 </Lib> 485 </ItemDefinitionGroup> 486 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 487 <ClCompile> 488 <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 489 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 490 <PrecompiledHeaderOutputFile> 491 </PrecompiledHeaderOutputFile> 321 492 </ClCompile> 322 493 <Lib> … … 358 529 <ClCompile Include="..\src\pjlib-util\scanner_cis_bitwise.c"> 359 530 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 531 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 360 532 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 361 533 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 534 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 362 535 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 363 536 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 537 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 364 538 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 365 539 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 540 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 366 541 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 367 542 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 543 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 368 544 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 369 545 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 546 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 370 547 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 371 548 </ClCompile> 372 549 <ClCompile Include="..\src\pjlib-util\scanner_cis_uint.c"> 373 550 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 551 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 374 552 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 375 553 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 554 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 376 555 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 377 556 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 557 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 378 558 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 379 559 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 560 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 380 561 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 381 562 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 563 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 382 564 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 383 565 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 566 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 384 567 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 385 568 </ClCompile> -
pjproject/trunk/pjlib-util/build/pjlib_util_test.vcxproj
r5175 r5539 51 51 </ProjectConfiguration> 52 52 </ItemGroup> 53 <!-- Import common config --> 54 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 55 <PropertyGroup Label="Globals"> 54 56 <ProjectGuid>{ED02BE13-8297-4770-8097-27DC2CCABF9A}</ProjectGuid> 55 <RootNamespace>pjlib_util_test</RootNamespace> 57 <RootNamespace>pjlib_util_test</RootNamespace> 58 <!-- Specific UWP property --> 59 <DefaultLanguage>en-US</DefaultLanguage> 56 60 </PropertyGroup> 57 61 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 127 131 <UseOfMfc>false</UseOfMfc> 128 132 <CharacterSet>MultiByte</CharacterSet> 133 </PropertyGroup> 134 <!-- Override the PlatformToolset --> 135 <PropertyGroup> 136 <PlatformToolset>$(BuildToolset)</PlatformToolset> 137 <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 138 <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType> 139 <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType> 129 140 </PropertyGroup> 130 141 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> … … 194 205 <PropertyGroup> 195 206 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 196 </PropertyGroup> 207 <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 208 </PropertyGroup> 209 <ItemDefinitionGroup> 210 <ClCompile> 211 <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 212 </ClCompile> 213 <Lib> 214 <OutputFile>..\lib\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 215 </Lib> 216 </ItemDefinitionGroup> 197 217 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'"> 198 218 <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> -
pjproject/trunk/pjlib/build/pjlib.vcxproj
r5168 r5539 2 2 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <ItemGroup Label="ProjectConfigurations"> 4 <ProjectConfiguration Include="Debug-Dynamic|ARM"> 5 <Configuration>Debug-Dynamic</Configuration> 6 <Platform>ARM</Platform> 7 </ProjectConfiguration> 4 8 <ProjectConfiguration Include="Debug-Dynamic|Win32"> 5 9 <Configuration>Debug-Dynamic</Configuration> … … 10 14 <Platform>x64</Platform> 11 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Debug-Static|ARM"> 17 <Configuration>Debug-Static</Configuration> 18 <Platform>ARM</Platform> 19 </ProjectConfiguration> 12 20 <ProjectConfiguration Include="Debug-Static|Win32"> 13 21 <Configuration>Debug-Static</Configuration> … … 18 26 <Platform>x64</Platform> 19 27 </ProjectConfiguration> 28 <ProjectConfiguration Include="Debug|ARM"> 29 <Configuration>Debug</Configuration> 30 <Platform>ARM</Platform> 31 </ProjectConfiguration> 20 32 <ProjectConfiguration Include="Debug|Win32"> 21 33 <Configuration>Debug</Configuration> … … 26 38 <Platform>x64</Platform> 27 39 </ProjectConfiguration> 40 <ProjectConfiguration Include="Release-Dynamic|ARM"> 41 <Configuration>Release-Dynamic</Configuration> 42 <Platform>ARM</Platform> 43 </ProjectConfiguration> 28 44 <ProjectConfiguration Include="Release-Dynamic|Win32"> 29 45 <Configuration>Release-Dynamic</Configuration> … … 34 50 <Platform>x64</Platform> 35 51 </ProjectConfiguration> 52 <ProjectConfiguration Include="Release-Static|ARM"> 53 <Configuration>Release-Static</Configuration> 54 <Platform>ARM</Platform> 55 </ProjectConfiguration> 36 56 <ProjectConfiguration Include="Release-Static|Win32"> 37 57 <Configuration>Release-Static</Configuration> … … 42 62 <Platform>x64</Platform> 43 63 </ProjectConfiguration> 64 <ProjectConfiguration Include="Release|ARM"> 65 <Configuration>Release</Configuration> 66 <Platform>ARM</Platform> 67 </ProjectConfiguration> 44 68 <ProjectConfiguration Include="Release|Win32"> 45 69 <Configuration>Release</Configuration> … … 51 75 </ProjectConfiguration> 52 76 </ItemGroup> 77 <!-- Import common config --> 78 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 79 <PropertyGroup Label="Globals"> 54 80 <ProjectGuid>{DA0E03ED-53A7-4050-8A85-90541C5509F8}</ProjectGuid> 55 81 <RootNamespace>pjlib</RootNamespace> 82 <!-- Specific UWP property --> 83 <DefaultLanguage>en-US</DefaultLanguage> 56 84 </PropertyGroup> 57 85 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 60 88 <PlatformToolset>v140</PlatformToolset> 61 89 <UseOfMfc>false</UseOfMfc> 62 <CharacterSet>MultiByte</CharacterSet> 90 </PropertyGroup> 91 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 92 <ConfigurationType>StaticLibrary</ConfigurationType> 93 <PlatformToolset>v140</PlatformToolset> 94 <UseOfMfc>false</UseOfMfc> 63 95 </PropertyGroup> 64 96 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> … … 66 98 <PlatformToolset>v140</PlatformToolset> 67 99 <UseOfMfc>false</UseOfMfc> 68 <CharacterSet>MultiByte</CharacterSet> 100 </PropertyGroup> 101 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 102 <ConfigurationType>StaticLibrary</ConfigurationType> 103 <PlatformToolset>v140</PlatformToolset> 104 <UseOfMfc>false</UseOfMfc> 69 105 </PropertyGroup> 70 106 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> … … 72 108 <PlatformToolset>v140</PlatformToolset> 73 109 <UseOfMfc>false</UseOfMfc> 74 <CharacterSet>MultiByte</CharacterSet> 110 </PropertyGroup> 111 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 112 <ConfigurationType>StaticLibrary</ConfigurationType> 113 <PlatformToolset>v140</PlatformToolset> 114 <UseOfMfc>false</UseOfMfc> 75 115 </PropertyGroup> 76 116 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> … … 78 118 <PlatformToolset>v140</PlatformToolset> 79 119 <UseOfMfc>false</UseOfMfc> 80 <CharacterSet>MultiByte</CharacterSet> 120 </PropertyGroup> 121 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 122 <ConfigurationType>StaticLibrary</ConfigurationType> 123 <PlatformToolset>v140</PlatformToolset> 124 <UseOfMfc>false</UseOfMfc> 81 125 </PropertyGroup> 82 126 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 84 128 <PlatformToolset>v140</PlatformToolset> 85 129 <UseOfMfc>false</UseOfMfc> 86 <CharacterSet>MultiByte</CharacterSet> 130 </PropertyGroup> 131 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 132 <ConfigurationType>StaticLibrary</ConfigurationType> 133 <PlatformToolset>v140</PlatformToolset> 134 <UseOfMfc>false</UseOfMfc> 87 135 </PropertyGroup> 88 136 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 90 138 <PlatformToolset>v140</PlatformToolset> 91 139 <UseOfMfc>false</UseOfMfc> 92 <CharacterSet>MultiByte</CharacterSet> 140 </PropertyGroup> 141 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 142 <ConfigurationType>StaticLibrary</ConfigurationType> 143 <PlatformToolset>v140</PlatformToolset> 144 <UseOfMfc>false</UseOfMfc> 93 145 </PropertyGroup> 94 146 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> … … 96 148 <PlatformToolset>v140</PlatformToolset> 97 149 <UseOfMfc>false</UseOfMfc> 98 <CharacterSet>MultiByte</CharacterSet>99 150 </PropertyGroup> 100 151 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration"> … … 102 153 <PlatformToolset>v140</PlatformToolset> 103 154 <UseOfMfc>false</UseOfMfc> 104 <CharacterSet>MultiByte</CharacterSet>105 155 </PropertyGroup> 106 156 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration"> … … 108 158 <PlatformToolset>v140</PlatformToolset> 109 159 <UseOfMfc>false</UseOfMfc> 110 <CharacterSet>MultiByte</CharacterSet>111 160 </PropertyGroup> 112 161 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration"> … … 114 163 <PlatformToolset>v140</PlatformToolset> 115 164 <UseOfMfc>false</UseOfMfc> 116 <CharacterSet>MultiByte</CharacterSet>117 165 </PropertyGroup> 118 166 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> … … 120 168 <PlatformToolset>v140</PlatformToolset> 121 169 <UseOfMfc>false</UseOfMfc> 122 <CharacterSet>MultiByte</CharacterSet>123 170 </PropertyGroup> 124 171 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> … … 126 173 <PlatformToolset>v140</PlatformToolset> 127 174 <UseOfMfc>false</UseOfMfc> 128 <CharacterSet>MultiByte</CharacterSet> 175 </PropertyGroup> 176 <!-- Override the PlatformToolset --> 177 <PropertyGroup> 178 <PlatformToolset>$(BuildToolset)</PlatformToolset> 179 <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"> 180 </CharacterSet> 129 181 </PropertyGroup> 130 182 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 131 183 <ImportGroup Label="ExtensionSettings"> 132 184 </ImportGroup> 133 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 134 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 135 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 136 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 185 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 186 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 187 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 188 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 189 </ImportGroup> 190 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 191 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 192 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 193 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 137 194 </ImportGroup> 138 195 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 139 196 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 140 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 141 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 197 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 198 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 199 </ImportGroup> 200 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 201 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 202 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 203 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 142 204 </ImportGroup> 143 205 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 144 206 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 145 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 146 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 207 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 208 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 209 </ImportGroup> 210 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 211 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 212 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 213 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 147 214 </ImportGroup> 148 215 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 149 216 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 150 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 151 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 217 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 218 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 219 </ImportGroup> 220 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 221 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 222 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 223 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 152 224 </ImportGroup> 153 225 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 154 226 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 155 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 156 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 227 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 228 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 229 </ImportGroup> 230 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 231 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 232 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 233 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 157 234 </ImportGroup> 158 235 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 159 236 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 160 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 161 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 237 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 238 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 239 </ImportGroup> 240 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 241 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 242 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 243 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 162 244 </ImportGroup> 163 245 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 164 246 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 165 166 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 247 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 248 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 167 249 </ImportGroup> 168 250 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 169 251 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 170 171 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 252 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 253 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 172 254 </ImportGroup> 173 255 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 174 256 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 175 176 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 257 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 258 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 177 259 </ImportGroup> 178 260 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 179 261 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 180 181 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 262 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 263 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 182 264 </ImportGroup> 183 265 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 184 266 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 185 186 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 267 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 268 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 187 269 </ImportGroup> 188 270 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 189 271 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 190 191 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 272 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 273 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 192 274 </ImportGroup> 193 275 <PropertyGroup Label="UserMacros" /> … … 195 277 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 196 278 </PropertyGroup> 279 <!-- Compile and link option definition --> 280 <ItemDefinitionGroup> 281 <ClCompile> 282 <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 283 </ClCompile> 284 </ItemDefinitionGroup> 197 285 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 286 <ClCompile> 287 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 288 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 289 <PrecompiledHeaderOutputFile /> 290 </ClCompile> 291 </ItemDefinitionGroup> 292 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 198 293 <ClCompile> 199 294 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> … … 220 315 </ClCompile> 221 316 </ItemDefinitionGroup> 317 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 318 <ClCompile> 319 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 320 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 321 <PrecompiledHeaderOutputFile> 322 </PrecompiledHeaderOutputFile> 323 </ClCompile> 324 </ItemDefinitionGroup> 222 325 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 223 326 <Midl> … … 237 340 </ClCompile> 238 341 </ItemDefinitionGroup> 342 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 343 <ClCompile> 344 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 345 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 346 <PrecompiledHeaderOutputFile /> 347 </ClCompile> 348 </ItemDefinitionGroup> 239 349 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 240 350 <Midl> … … 255 365 </ClCompile> 256 366 </ItemDefinitionGroup> 367 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 368 <ClCompile> 369 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 370 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 371 <PrecompiledHeaderOutputFile /> 372 </ClCompile> 373 </ItemDefinitionGroup> 257 374 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 258 375 <Midl> … … 272 389 </ClCompile> 273 390 </ItemDefinitionGroup> 391 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 392 <ClCompile> 393 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 394 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 395 <PrecompiledHeaderOutputFile /> 396 </ClCompile> 397 </ItemDefinitionGroup> 274 398 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 275 399 <Midl> … … 290 414 </ClCompile> 291 415 </ItemDefinitionGroup> 416 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 417 <ClCompile> 418 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 419 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 420 <PrecompiledHeaderOutputFile /> 421 </ClCompile> 422 </ItemDefinitionGroup> 292 423 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'"> 293 424 <Midl> … … 301 432 </ItemDefinitionGroup> 302 433 <ItemGroup> 434 <ClCompile Include="..\..\third_party\threademulation\src\ThreadEmulation.cpp"> 435 <ExcludedFromBuild Condition="'$(API_Family)'=='WinDesktop'">true</ExcludedFromBuild> 436 <CompileAsWinRT>true</CompileAsWinRT> 437 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 438 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 439 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 440 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 441 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 442 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 443 <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">MultiThreadedDLL</RuntimeLibrary> 444 <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MultiThreadedDLL</RuntimeLibrary> 445 <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">MultiThreadedDLL</RuntimeLibrary> 446 <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">MultiThreadedDLL</RuntimeLibrary> 447 </ClCompile> 303 448 <ClCompile Include="..\src\pj\activesock.c" /> 304 449 <ClCompile Include="..\src\pj\addr_resolv_linux_kernel.c"> 305 450 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 306 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 307 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 308 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 309 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 310 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 311 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 312 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 313 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 314 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 315 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 451 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 452 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 453 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 454 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 455 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 456 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 457 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 458 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 459 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 460 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 461 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 462 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 463 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 464 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 465 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 466 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 316 467 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 317 468 </ClCompile> … … 326 477 <ClCompile Include="..\src\pj\file_io_ansi.c"> 327 478 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 328 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 329 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 330 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 331 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 332 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 333 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 334 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 335 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 336 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 337 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 338 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 339 </ClCompile> 340 <ClCompile Include="..\src\pj\file_io_win32.c" /> 479 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 480 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 481 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 482 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 483 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 484 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 485 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 486 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 487 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 488 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 489 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 490 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 491 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 492 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 493 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 494 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 495 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 496 </ClCompile> 497 <ClCompile Include="..\src\pj\file_io_win32.c" /> 341 498 <ClCompile Include="..\src\pj\guid.c" /> 342 499 <ClCompile Include="..\src\pj\guid_simple.c"> 343 500 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 344 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 345 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 346 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 347 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 348 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 349 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 350 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 351 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 352 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 353 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 501 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 502 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 503 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 504 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 505 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 506 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 507 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 508 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 509 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 510 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 511 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 512 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 513 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 514 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 515 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 516 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 354 517 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 355 518 </ClCompile> … … 358 521 <ClCompile Include="..\src\pj\ioqueue_common_abs.c"> 359 522 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 360 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 361 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 362 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 363 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 364 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 365 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 366 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 367 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 368 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 369 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 523 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 524 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 525 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 526 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 527 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 528 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 529 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 530 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 531 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 532 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 533 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 534 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 535 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 536 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 537 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 538 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 370 539 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 371 540 </ClCompile> 372 541 <ClCompile Include="..\src\pj\ioqueue_dummy.c"> 373 542 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 374 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 375 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 376 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 377 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 378 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 379 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 380 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 381 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 382 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 383 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 543 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 544 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 545 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 546 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 547 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 548 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 549 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 550 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 551 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 552 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 553 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 554 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 555 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 556 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 557 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 558 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 384 559 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 385 560 </ClCompile> 386 561 <ClCompile Include="..\src\pj\ioqueue_epoll.c"> 387 562 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 388 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 389 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 390 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 391 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 392 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 393 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 394 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 395 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 396 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 397 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 563 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 564 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 565 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 566 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 567 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 568 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 569 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 570 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 571 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 572 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 573 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 574 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 575 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 576 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 577 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 578 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 398 579 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 399 580 </ClCompile> … … 401 582 <ClCompile Include="..\src\pj\ioqueue_winnt.c"> 402 583 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 403 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 404 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 405 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 406 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 407 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 408 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 409 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 410 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 411 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 412 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 413 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 584 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 585 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 586 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 587 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 588 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 589 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 590 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 591 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 592 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 593 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 594 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 595 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 596 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 597 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 598 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 599 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 600 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 601 </ClCompile> 602 <ClCompile Include="..\src\pj\ip_helper_winphone8.c"> 603 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 604 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 605 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 606 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 607 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 608 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 609 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 610 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 611 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 612 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 613 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 614 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 615 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 616 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 617 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 618 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 619 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 620 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 621 </ClCompile> 622 <ClCompile Include="..\src\pj\ip_helper_win32.c"> 623 <ExcludedFromBuild Condition="'$(API_Family)'!='WinDesktop'">true</ExcludedFromBuild> 414 624 </ClCompile> 415 625 <ClCompile Include="..\src\pj\ip_helper_generic.c"> 416 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 417 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 418 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 419 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 420 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 421 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 422 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 423 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 424 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 425 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 426 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 427 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 428 </ClCompile> 429 <ClCompile Include="..\src\pj\ip_helper_win32.c" /> 626 <ExcludedFromBuild Condition="'$(API_Family)'=='WinDesktop'">true</ExcludedFromBuild> 627 </ClCompile> 430 628 <ClCompile Include="..\src\pj\list.c" /> 431 629 <ClCompile Include="..\src\pj\lock.c" /> … … 433 631 <ClCompile Include="..\src\pj\log_writer_printk.c"> 434 632 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 435 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 436 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 437 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 438 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 439 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 440 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 441 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 442 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 443 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 444 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 633 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 634 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 635 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 636 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 637 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 638 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 639 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 640 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 641 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 642 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 643 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 644 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 645 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 646 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 647 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 648 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 445 649 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 446 650 </ClCompile> … … 448 652 <ClCompile Include="..\src\pj\os_core_linux_kernel.c"> 449 653 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 450 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 451 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 452 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 453 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 454 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 455 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 456 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 457 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 458 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 459 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 654 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 655 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 656 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 657 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 658 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 659 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 660 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 661 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 662 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 663 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 664 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 665 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 666 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 667 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 668 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 669 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 460 670 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 461 671 </ClCompile> 462 672 <ClCompile Include="..\src\pj\os_core_unix.c"> 463 673 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 464 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 465 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 466 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 467 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 468 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 469 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 470 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 471 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 472 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 473 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 674 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 675 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 676 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 677 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 678 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 679 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 680 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 681 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 682 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 683 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 684 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 685 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 686 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 687 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 688 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 689 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 474 690 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 475 691 </ClCompile> … … 477 693 <ClCompile Include="..\src\pj\os_error_linux_kernel.c"> 478 694 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 479 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 480 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 481 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 482 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 483 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 484 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 485 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 486 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 487 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 488 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 695 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 696 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 697 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 698 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 699 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 700 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 701 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 702 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 703 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 704 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 705 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 706 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 707 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 708 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 709 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 710 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 489 711 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 490 712 </ClCompile> 491 713 <ClCompile Include="..\src\pj\os_error_unix.c"> 492 714 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 493 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 494 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 495 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 496 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 497 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 498 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 499 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 500 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 501 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 502 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 715 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 716 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 717 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 718 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 719 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 720 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 721 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 722 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 723 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 724 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 725 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 726 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 727 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 728 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 729 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 730 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 503 731 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 504 732 </ClCompile> … … 508 736 <ClCompile Include="..\src\pj\os_timestamp_linux.c"> 509 737 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 510 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 511 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 512 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 513 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 514 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 515 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 516 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 517 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 518 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 519 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 738 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 739 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 740 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 741 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 742 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 743 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 744 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 745 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 746 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 747 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 748 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 749 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 750 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 751 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 752 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 753 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 520 754 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 521 755 </ClCompile> 522 756 <ClCompile Include="..\src\pj\os_timestamp_linux_kernel.c"> 523 757 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 524 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 525 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 526 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 527 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 528 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 529 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 530 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 531 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 532 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 533 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 758 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 759 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 760 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 761 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 762 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 763 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 764 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 765 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 766 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 767 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 768 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 769 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 770 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 771 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 772 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 773 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 534 774 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 535 775 </ClCompile> … … 537 777 <ClCompile Include="..\src\pj\os_time_linux_kernel.c"> 538 778 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 539 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 540 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 541 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 542 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 543 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 544 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 545 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 546 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 547 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 548 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 779 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 780 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 781 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 782 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 783 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 784 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 785 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 786 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 787 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 788 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 789 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 790 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 791 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 792 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 793 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 794 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 549 795 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 550 796 </ClCompile> … … 556 802 <ClCompile Include="..\src\pj\pool_policy_kmalloc.c"> 557 803 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 558 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 559 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 560 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 561 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 562 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 563 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 564 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 565 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 566 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 567 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 804 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 805 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 806 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 807 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 808 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 809 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 810 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 811 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 812 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 813 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 814 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 815 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 816 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 817 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 818 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 819 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 568 820 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 569 821 </ClCompile> … … 575 827 <ClCompile Include="..\src\pj\sock_linux_kernel.c"> 576 828 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 577 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 578 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 579 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 580 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 581 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 582 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 583 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 584 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 585 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 586 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 829 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 830 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 831 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 832 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 833 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 834 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 835 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 836 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 837 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 838 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 839 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 840 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 841 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 842 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 843 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 844 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 587 845 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 588 846 </ClCompile> … … 598 856 <ClCompile Include="..\src\pj\symbols.c"> 599 857 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 600 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 601 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 602 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 603 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 604 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 605 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 606 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 607 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 608 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 609 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 858 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 859 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 860 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 861 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 862 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 863 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 864 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 865 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 866 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 867 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 868 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 869 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 870 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 871 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 872 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 873 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 610 874 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 611 875 </ClCompile> … … 615 879 </ItemGroup> 616 880 <ItemGroup> 881 <ClInclude Include="..\..\third_party\threademulation\include\ThreadEmulation.h" /> 617 882 <ClInclude Include="..\include\pjlib.h" /> 618 883 <ClInclude Include="..\include\pj\activesock.h" /> … … 637 902 <ClInclude Include="..\include\pj\compat\os_win32.h" /> 638 903 <ClInclude Include="..\include\pj\compat\os_win32_wince.h" /> 904 <ClInclude Include="..\include\pj\compat\os_winphone8.h" /> 905 <ClInclude Include="..\include\pj\compat\os_winuwp.h" /> 639 906 <ClInclude Include="..\include\pj\compat\rand.h" /> 640 907 <ClInclude Include="..\include\pj\compat\setjmp.h" /> … … 644 911 <ClInclude Include="..\include\pj\compat\stdfileio.h" /> 645 912 <ClInclude Include="..\include\pj\compat\string.h" /> 646 <ClInclude Include="..\include\pj\compat\time.h" /> 913 <ClInclude Include="..\include\pj\compat\time.h" /> 647 914 <ClInclude Include="..\include\pj\config.h" /> 648 915 <ClInclude Include="..\include\pj\config_site.h" /> 649 916 <ClInclude Include="..\include\pj\config_site_sample.h" /> 650 917 <ClInclude Include="..\include\pj\ctype.h" /> 651 <ClInclude Include="..\include\pj\doxygen.h" /> 918 <ClInclude Include="..\include\pj\doxygen.h" /> 652 919 <ClInclude Include="..\include\pj\errno.h" /> 653 920 <ClInclude Include="..\include\pj\except.h" /> -
pjproject/trunk/pjlib/build/pjlib.vcxproj.filters
r5181 r5539 19 19 <UniqueIdentifier>{4befc994-9aa4-47c8-99e7-5a51301220dd}</UniqueIdentifier> 20 20 </Filter> 21 <Filter Include="Source Files\winrt"> 22 <UniqueIdentifier>{4a92fce6-2308-44cf-aa66-00ccd5b333bd}</UniqueIdentifier> 23 </Filter> 24 <Filter Include="Header Files\winrt"> 25 <UniqueIdentifier>{3550aa38-c59d-4d5f-b458-1f93e0b16bbd}</UniqueIdentifier> 26 </Filter> 21 27 </ItemGroup> 22 28 <ItemGroup> … … 180 186 <Filter>Source Files\Other Targets</Filter> 181 187 </ClCompile> 188 <ClCompile Include="..\src\pj\log_writer_printk.c"> 189 <Filter>Source Files\Other Targets</Filter> 190 </ClCompile> 191 <ClCompile Include="..\src\pj\os_core_linux_kernel.c"> 192 <Filter>Source Files\Other Targets</Filter> 193 </ClCompile> 194 <ClCompile Include="..\src\pj\os_core_unix.c"> 195 <Filter>Source Files\Other Targets</Filter> 196 </ClCompile> 197 <ClCompile Include="..\src\pj\os_error_linux_kernel.c"> 198 <Filter>Source Files\Other Targets</Filter> 199 </ClCompile> 200 <ClCompile Include="..\src\pj\os_error_unix.c"> 201 <Filter>Source Files\Other Targets</Filter> 202 </ClCompile> 203 <ClCompile Include="..\src\pj\os_time_linux_kernel.c"> 204 <Filter>Source Files\Other Targets</Filter> 205 </ClCompile> 206 <ClCompile Include="..\src\pj\os_timestamp_linux.c"> 207 <Filter>Source Files\Other Targets</Filter> 208 </ClCompile> 209 <ClCompile Include="..\src\pj\os_timestamp_linux_kernel.c"> 210 <Filter>Source Files\Other Targets</Filter> 211 </ClCompile> 212 <ClCompile Include="..\src\pj\pool_policy_kmalloc.c"> 213 <Filter>Source Files\Other Targets</Filter> 214 </ClCompile> 215 <ClCompile Include="..\src\pj\sock_linux_kernel.c"> 216 <Filter>Source Files\Other Targets</Filter> 217 </ClCompile> 218 <ClCompile Include="..\src\pj\symbols.c"> 219 <Filter>Source Files\Other Targets</Filter> 220 </ClCompile> 221 <ClCompile Include="..\..\third_party\threademulation\src\ThreadEmulation.cpp"> 222 <Filter>Source Files\winrt</Filter> 223 </ClCompile> 224 <ClCompile Include="..\src\pj\ip_helper_winphone8.c"> 225 <Filter>Source Files</Filter> 226 </ClCompile> 182 227 <ClCompile Include="..\src\pj\ip_helper_generic.c"> 183 <Filter>Source Files\Other Targets</Filter> 184 </ClCompile> 185 <ClCompile Include="..\src\pj\log_writer_printk.c"> 186 <Filter>Source Files\Other Targets</Filter> 187 </ClCompile> 188 <ClCompile Include="..\src\pj\os_core_linux_kernel.c"> 189 <Filter>Source Files\Other Targets</Filter> 190 </ClCompile> 191 <ClCompile Include="..\src\pj\os_core_unix.c"> 192 <Filter>Source Files\Other Targets</Filter> 193 </ClCompile> 194 <ClCompile Include="..\src\pj\os_error_linux_kernel.c"> 195 <Filter>Source Files\Other Targets</Filter> 196 </ClCompile> 197 <ClCompile Include="..\src\pj\os_error_unix.c"> 198 <Filter>Source Files\Other Targets</Filter> 199 </ClCompile> 200 <ClCompile Include="..\src\pj\os_time_linux_kernel.c"> 201 <Filter>Source Files\Other Targets</Filter> 202 </ClCompile> 203 <ClCompile Include="..\src\pj\os_timestamp_linux.c"> 204 <Filter>Source Files\Other Targets</Filter> 205 </ClCompile> 206 <ClCompile Include="..\src\pj\os_timestamp_linux_kernel.c"> 207 <Filter>Source Files\Other Targets</Filter> 208 </ClCompile> 209 <ClCompile Include="..\src\pj\pool_policy_kmalloc.c"> 210 <Filter>Source Files\Other Targets</Filter> 211 </ClCompile> 212 <ClCompile Include="..\src\pj\sock_linux_kernel.c"> 213 <Filter>Source Files\Other Targets</Filter> 214 </ClCompile> 215 <ClCompile Include="..\src\pj\symbols.c"> 216 <Filter>Source Files\Other Targets</Filter> 228 <Filter>Source Files</Filter> 229 </ClCompile> 230 <ClCompile Include="..\src\pj\ip_helper_generic.c"> 231 <Filter>Source Files</Filter> 217 232 </ClCompile> 218 233 </ItemGroup> … … 248 263 <Filter>Header Files</Filter> 249 264 </ClInclude> 250 <ClInclude Include="..\include\pj\equeue.h">251 <Filter>Header Files</Filter>252 </ClInclude>253 265 <ClInclude Include="..\include\pj\errno.h"> 254 266 <Filter>Header Files</Filter> … … 408 420 </ClInclude> 409 421 <ClInclude Include="..\include\pj\compat\time.h"> 410 <Filter>Header Files\compat</Filter>411 </ClInclude>412 <ClInclude Include="..\include\pj\compat\vsprintf.h">413 422 <Filter>Header Files\compat</Filter> 414 423 </ClInclude> … … 422 431 <Filter>Inline Files</Filter> 423 432 </ClInclude> 433 <ClInclude Include="..\include\pj\compat\os_winphone8.h"> 434 <Filter>Header Files\compat</Filter> 435 </ClInclude> 436 <ClInclude Include="..\..\third_party\threademulation\include\ThreadEmulation.h"> 437 <Filter>Header Files\winrt</Filter> 438 </ClInclude> 439 <ClInclude Include="..\include\pj\compat\os_winuwp.h"> 440 <Filter>Header Files\compat</Filter> 441 </ClInclude> 424 442 </ItemGroup> 425 443 </Project> -
pjproject/trunk/pjlib/build/pjlib_test.vcxproj
r5168 r5539 2 2 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <ItemGroup Label="ProjectConfigurations"> 4 <ProjectConfiguration Include="Debug-Dynamic|ARM"> 5 <Configuration>Debug-Dynamic</Configuration> 6 <Platform>ARM</Platform> 7 </ProjectConfiguration> 4 8 <ProjectConfiguration Include="Debug-Dynamic|Win32"> 5 9 <Configuration>Debug-Dynamic</Configuration> … … 10 14 <Platform>x64</Platform> 11 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Debug-Static|ARM"> 17 <Configuration>Debug-Static</Configuration> 18 <Platform>ARM</Platform> 19 </ProjectConfiguration> 12 20 <ProjectConfiguration Include="Debug-Static|Win32"> 13 21 <Configuration>Debug-Static</Configuration> … … 18 26 <Platform>x64</Platform> 19 27 </ProjectConfiguration> 28 <ProjectConfiguration Include="Debug|ARM"> 29 <Configuration>Debug</Configuration> 30 <Platform>ARM</Platform> 31 </ProjectConfiguration> 20 32 <ProjectConfiguration Include="Debug|Win32"> 21 33 <Configuration>Debug</Configuration> … … 26 38 <Platform>x64</Platform> 27 39 </ProjectConfiguration> 40 <ProjectConfiguration Include="Release-Dynamic|ARM"> 41 <Configuration>Release-Dynamic</Configuration> 42 <Platform>ARM</Platform> 43 </ProjectConfiguration> 28 44 <ProjectConfiguration Include="Release-Dynamic|Win32"> 29 45 <Configuration>Release-Dynamic</Configuration> … … 34 50 <Platform>x64</Platform> 35 51 </ProjectConfiguration> 52 <ProjectConfiguration Include="Release-Static|ARM"> 53 <Configuration>Release-Static</Configuration> 54 <Platform>ARM</Platform> 55 </ProjectConfiguration> 36 56 <ProjectConfiguration Include="Release-Static|Win32"> 37 57 <Configuration>Release-Static</Configuration> … … 42 62 <Platform>x64</Platform> 43 63 </ProjectConfiguration> 64 <ProjectConfiguration Include="Release|ARM"> 65 <Configuration>Release</Configuration> 66 <Platform>ARM</Platform> 67 </ProjectConfiguration> 44 68 <ProjectConfiguration Include="Release|Win32"> 45 69 <Configuration>Release</Configuration> … … 51 75 </ProjectConfiguration> 52 76 </ItemGroup> 77 <!-- Import common config --> 78 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 79 <PropertyGroup Label="Globals"> 54 80 <ProjectGuid>{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}</ProjectGuid> 55 <RootNamespace>pjlib_test</RootNamespace> 81 <RootNamespace>pjlib_test</RootNamespace> 82 <!-- Specific UWP property --> 83 <DefaultLanguage>en-US</DefaultLanguage> 56 84 </PropertyGroup> 57 85 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 62 90 <CharacterSet>MultiByte</CharacterSet> 63 91 </PropertyGroup> 92 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 93 <ConfigurationType>Application</ConfigurationType> 94 <PlatformToolset>v140</PlatformToolset> 95 <UseOfMfc>false</UseOfMfc> 96 <CharacterSet>MultiByte</CharacterSet> 97 </PropertyGroup> 64 98 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 65 99 <ConfigurationType>Application</ConfigurationType> … … 68 102 <CharacterSet>MultiByte</CharacterSet> 69 103 </PropertyGroup> 104 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 105 <ConfigurationType>Application</ConfigurationType> 106 <PlatformToolset>v140</PlatformToolset> 107 <UseOfMfc>false</UseOfMfc> 108 <CharacterSet>MultiByte</CharacterSet> 109 </PropertyGroup> 70 110 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 71 111 <ConfigurationType>Application</ConfigurationType> … … 74 114 <CharacterSet>MultiByte</CharacterSet> 75 115 </PropertyGroup> 116 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 117 <ConfigurationType>Application</ConfigurationType> 118 <PlatformToolset>v140</PlatformToolset> 119 <UseOfMfc>false</UseOfMfc> 120 <CharacterSet>MultiByte</CharacterSet> 121 </PropertyGroup> 76 122 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 77 123 <ConfigurationType>Application</ConfigurationType> … … 80 126 <CharacterSet>MultiByte</CharacterSet> 81 127 </PropertyGroup> 128 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 129 <ConfigurationType>Application</ConfigurationType> 130 <PlatformToolset>v140</PlatformToolset> 131 <UseOfMfc>false</UseOfMfc> 132 <CharacterSet>MultiByte</CharacterSet> 133 </PropertyGroup> 82 134 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 83 135 <ConfigurationType>Application</ConfigurationType> … … 86 138 <CharacterSet>MultiByte</CharacterSet> 87 139 </PropertyGroup> 140 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 141 <ConfigurationType>Application</ConfigurationType> 142 <PlatformToolset>v140</PlatformToolset> 143 <UseOfMfc>false</UseOfMfc> 144 <CharacterSet>MultiByte</CharacterSet> 145 </PropertyGroup> 88 146 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 89 147 <ConfigurationType>Application</ConfigurationType> … … 92 150 <CharacterSet>MultiByte</CharacterSet> 93 151 </PropertyGroup> 152 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 153 <ConfigurationType>Application</ConfigurationType> 154 <PlatformToolset>v140</PlatformToolset> 155 <UseOfMfc>false</UseOfMfc> 156 <CharacterSet>MultiByte</CharacterSet> 157 </PropertyGroup> 94 158 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 95 159 <ConfigurationType>Application</ConfigurationType> … … 127 191 <UseOfMfc>false</UseOfMfc> 128 192 <CharacterSet>MultiByte</CharacterSet> 193 </PropertyGroup> 194 <!-- Override the PlatformToolset --> 195 <PropertyGroup> 196 <PlatformToolset>$(BuildToolset)</PlatformToolset> 197 <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"> 198 </CharacterSet> 199 <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType> 200 <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType> 129 201 </PropertyGroup> 130 202 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 131 203 <ImportGroup Label="ExtensionSettings"> 132 204 </ImportGroup> 133 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 134 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 135 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 136 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 205 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 206 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 207 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 208 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 209 </ImportGroup> 210 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 211 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 212 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 213 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 137 214 </ImportGroup> 138 215 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 139 216 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 140 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 141 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 217 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 218 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 219 </ImportGroup> 220 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 221 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 222 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 223 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 142 224 </ImportGroup> 143 225 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 144 226 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 145 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 146 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 227 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 228 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 229 </ImportGroup> 230 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 231 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 232 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 233 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 147 234 </ImportGroup> 148 235 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 149 236 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 150 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 151 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 237 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 238 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 239 </ImportGroup> 240 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 241 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 242 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 243 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 152 244 </ImportGroup> 153 245 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 154 246 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 155 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 156 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 247 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 248 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 249 </ImportGroup> 250 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 251 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 252 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 253 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 157 254 </ImportGroup> 158 255 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 159 256 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 160 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 161 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 257 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 258 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 259 </ImportGroup> 260 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 261 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 262 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 263 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 162 264 </ImportGroup> 163 265 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 164 266 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 165 166 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 267 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 268 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 167 269 </ImportGroup> 168 270 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 169 271 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 170 171 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 272 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 273 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 172 274 </ImportGroup> 173 275 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 174 276 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 175 176 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 277 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 278 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 177 279 </ImportGroup> 178 280 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 179 281 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 180 181 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 282 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 283 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 182 284 </ImportGroup> 183 285 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 184 286 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 185 186 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 287 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 288 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 187 289 </ImportGroup> 188 290 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 189 291 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 190 191 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 292 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 293 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 192 294 </ImportGroup> 193 295 <PropertyGroup Label="UserMacros" /> 194 296 <PropertyGroup> 195 297 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 196 <TargetName>pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 197 </PropertyGroup> 298 <TargetName>pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 299 </PropertyGroup> 300 <!-- Compile and link option definition --> 301 <ItemDefinitionGroup> 302 <ClCompile> 303 <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 304 </ClCompile> 305 <Lib> 306 <OutputFile>..\lib\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 307 </Lib> 308 </ItemDefinitionGroup> 198 309 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 199 310 <ClCompile> … … 201 312 <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 202 313 <PrecompiledHeaderOutputFile /> 314 </ClCompile> 315 <Link> 316 <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 317 <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 318 </Link> 319 </ItemDefinitionGroup> 320 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 321 <ClCompile> 322 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 323 <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 324 <PrecompiledHeaderOutputFile> 325 </PrecompiledHeaderOutputFile> 203 326 </ClCompile> 204 327 <Link> … … 234 357 </Link> 235 358 </ItemDefinitionGroup> 359 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 360 <ClCompile> 361 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 362 <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 363 <PrecompiledHeaderOutputFile> 364 </PrecompiledHeaderOutputFile> 365 </ClCompile> 366 <Link> 367 <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 368 <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 369 </Link> 370 </ItemDefinitionGroup> 236 371 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 237 372 <Midl> … … 260 395 </Link> 261 396 </ItemDefinitionGroup> 397 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 398 <ClCompile> 399 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 400 <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 401 <PrecompiledHeaderOutputFile> 402 </PrecompiledHeaderOutputFile> 403 </ClCompile> 404 <Link> 405 <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 406 <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 407 </Link> 408 </ItemDefinitionGroup> 262 409 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 263 410 <Midl> … … 287 434 </Link> 288 435 </ItemDefinitionGroup> 436 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 437 <ClCompile> 438 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 439 <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 440 <PrecompiledHeaderOutputFile> 441 </PrecompiledHeaderOutputFile> 442 </ClCompile> 443 <Link> 444 <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 445 <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 446 </Link> 447 </ItemDefinitionGroup> 289 448 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 290 449 <Midl> … … 313 472 </Link> 314 473 </ItemDefinitionGroup> 474 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 475 <ClCompile> 476 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 477 <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 478 <PrecompiledHeaderOutputFile> 479 </PrecompiledHeaderOutputFile> 480 </ClCompile> 481 <Link> 482 <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 483 <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 484 </Link> 485 </ItemDefinitionGroup> 315 486 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 316 487 <Midl> … … 334 505 <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 335 506 <PrecompiledHeaderOutputFile /> 507 </ClCompile> 508 <Link> 509 <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies> 510 <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile> 511 </Link> 512 </ItemDefinitionGroup> 513 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 514 <ClCompile> 515 <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 516 <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 517 <PrecompiledHeaderOutputFile> 518 </PrecompiledHeaderOutputFile> 336 519 </ClCompile> 337 520 <Link> … … 369 552 <ClCompile Include="..\src\pjlib-test\ioq_unreg.c" /> 370 553 <ClCompile Include="..\src\pjlib-test\list.c" /> 371 <ClCompile Include="..\src\pjlib-test\main.c" /> 554 <ClCompile Condition="'$(API_Family)'=='WinDesktop'" Include="..\src\pjlib-test\main.c"> 555 </ClCompile> 372 556 <ClCompile Include="..\src\pjlib-test\main_mod.c"> 373 557 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 558 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 374 559 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 375 560 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 561 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 376 562 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 377 563 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 564 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 378 565 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 379 566 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 567 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 380 568 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 381 569 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 570 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 382 571 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 383 572 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 573 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 384 574 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 385 575 </ClCompile> 386 576 <ClCompile Include="..\src\pjlib-test\main_win32.c"> 387 577 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 578 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 388 579 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 389 580 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 581 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 390 582 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 391 583 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 584 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 392 585 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 393 586 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 587 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 394 588 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 395 589 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 590 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 396 591 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 397 592 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 593 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 398 594 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 399 595 </ClCompile> -
pjproject/trunk/pjlib/build/pjlib_test.vcxproj.filters
r5181 r5539 53 53 </ClCompile> 54 54 <ClCompile Include="..\src\pjlib-test\list.c"> 55 <Filter>Source Files</Filter>56 </ClCompile>57 <ClCompile Include="..\src\pjlib-test\main.c">58 55 <Filter>Source Files</Filter> 59 56 </ClCompile> -
pjproject/trunk/pjlib/include/pj/config.h
r5472 r5539 77 77 # define PJ_WIN32 1 78 78 79 #elif defined(PJ_WIN32_WINPHONE8) || defined(_WIN32_WINPHONE8) 80 /* 81 * Windows Phone 8 82 */ 83 # undef PJ_WIN32_WINPHONE8 84 # define PJ_WIN32_WINPHONE8 1 85 # include <pj/compat/os_winphone8.h> 86 87 /* Also define Win32 */ 88 # define PJ_WIN32 1 89 90 #elif defined(PJ_WIN32_UWP) || defined(_WIN32_UWP) 91 /* 92 * Windows UWP 93 */ 94 # undef PJ_WIN32_UWP 95 # define PJ_WIN32_UWP 1 96 # include <pj/compat/os_winuwp.h> 97 98 /* Define Windows phone */ 99 # define PJ_WIN32_WINPHONE8 1 100 101 /* Also define Win32 */ 102 # define PJ_WIN32 1 103 79 104 #elif defined(PJ_WIN32) || defined(_WIN32) || defined(__WIN32__) || \ 80 105 defined(WIN32) || defined(PJ_WIN64) || defined(_WIN64) || \ … … 237 262 # define PJ_IS_BIG_ENDIAN 1 238 263 239 #elif defined (PJ_M_ARMV4) || defined(ARM) || defined(_ARM_) || \240 defined(ARMV4) || defined(__arm__) 264 #elif defined(ARM) || defined(_ARM_) || defined(__arm__) || defined(_M_ARM) 265 # define PJ_HAS_PENTIUM 0 241 266 /* 242 267 * ARM, bi-endian, so raise error if endianness is not configured 243 268 */ 244 # undef PJ_M_ARMV4245 # define PJ_M_ARMV4 1246 # define PJ_M_NAME "armv4"247 # define PJ_HAS_PENTIUM 0248 269 # if !PJ_IS_LITTLE_ENDIAN && !PJ_IS_BIG_ENDIAN 249 270 # error Endianness must be declared for this processor 250 271 # endif 272 # if defined (PJ_M_ARMV7) || defined(ARMV7) 273 # undef PJ_M_ARMV7 274 # define PJ_M_ARM7 1 275 # define PJ_M_NAME "armv7" 276 # elif defined (PJ_M_ARMV4) || defined(ARMV4) 277 # undef PJ_M_ARMV4 278 # define PJ_M_ARMV4 1 279 # define PJ_M_NAME "armv4" 280 # endif 251 281 252 282 #elif defined (PJ_M_POWERPC) || defined(__powerpc) || defined(__powerpc__) || \ -
pjproject/trunk/pjlib/src/pj/file_access_win32.c
r3553 r5539 34 34 #endif 35 35 36 static pj_status_t get_file_size(HANDLE hFile, pj_off_t *size) 37 { 38 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 39 FILE_COMPRESSION_INFO fileInfo; 40 41 if (GetFileInformationByHandleEx(hFile, FileCompressionInfo, &fileInfo, 42 sizeof(FILE_COMPRESSION_INFO))) 43 { 44 *size = fileInfo.CompressedFileSize.QuadPart; 45 } 46 else { 47 *size = -1; 48 return PJ_RETURN_OS_ERROR(GetLastError()); 49 } 50 #else 51 DWORD sizeLo, sizeHi; 52 53 sizeLo = GetFileSize(hFile, &sizeHi); 54 if (sizeLo == INVALID_FILE_SIZE) { 55 DWORD dwStatus = GetLastError(); 56 if (dwStatus != NO_ERROR) { 57 *size = -1; 58 return PJ_RETURN_OS_ERROR(dwStatus); 59 } 60 } 61 *size = sizeHi; 62 *size = ((*size) << 32) + sizeLo; 63 #endif 64 return PJ_SUCCESS; 65 } 66 67 static HANDLE WINAPI create_file(LPCTSTR filename, DWORD desired_access, 68 DWORD share_mode, 69 LPSECURITY_ATTRIBUTES security_attributes, 70 DWORD creation_disposition, 71 DWORD flags_and_attributes, 72 HANDLE template_file) 73 { 74 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 75 PJ_UNUSED_ARG(security_attributes); 76 PJ_UNUSED_ARG(flags_and_attributes); 77 PJ_UNUSED_ARG(template_file); 78 79 return CreateFile2(filename, desired_access, share_mode, 80 creation_disposition, NULL); 81 #else 82 return CreateFile(filename, desired_access, share_mode, 83 security_attributes, creation_disposition, 84 flags_and_attributes, template_file); 85 #endif 86 } 36 87 37 88 /* … … 45 96 PJ_ASSERT_RETURN(filename != NULL, 0); 46 97 47 hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename,sizeof(wfilename)), 48 CONTROL_ACCESS, 49 FILE_SHARE_READ, NULL, 50 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); 98 hFile = create_file(PJ_STRING_TO_NATIVE(filename, 99 wfilename, sizeof(wfilename)), 100 CONTROL_ACCESS, 101 FILE_SHARE_READ, NULL, 102 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); 51 103 if (hFile == INVALID_HANDLE_VALUE) 52 104 return 0; … … 63 115 { 64 116 PJ_DECL_UNICODE_TEMP_BUF(wfilename,256) 65 HANDLE hFile; 66 DWORD sizeLo, sizeHi; 117 HANDLE hFile; 67 118 pj_off_t size; 68 119 69 120 PJ_ASSERT_RETURN(filename != NULL, -1); 70 121 71 hFile = CreateFile(PJ_STRING_TO_NATIVE(filename, wfilename,sizeof(wfilename)), 72 CONTROL_ACCESS, 73 FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, 74 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); 122 hFile = create_file(PJ_STRING_TO_NATIVE(filename, 123 wfilename, sizeof(wfilename)), 124 CONTROL_ACCESS, 125 FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, 126 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); 75 127 if (hFile == INVALID_HANDLE_VALUE) 76 128 return -1; 77 129 78 sizeLo = GetFileSize(hFile, &sizeHi); 79 if (sizeLo == INVALID_FILE_SIZE) { 80 DWORD dwStatus = GetLastError(); 81 if (dwStatus != NO_ERROR) { 82 CloseHandle(hFile); 83 return -1; 84 } 85 } 86 87 size = sizeHi; 88 size = (size << 32) + sizeLo; 130 get_file_size(hFile, &size); 89 131 90 132 CloseHandle(hFile); … … 139 181 pj_time_val *time_val) 140 182 { 183 #if !defined(PJ_WIN32_WINPHONE8) || !PJ_WIN32_WINPHONE8 141 184 FILETIME local_file_time; 185 #endif 186 142 187 SYSTEMTIME localTime; 143 188 pj_parsed_time pt; 144 189 190 #if !defined(PJ_WIN32_WINPHONE8) || !PJ_WIN32_WINPHONE8 145 191 if (!FileTimeToLocalFileTime(file_time, &local_file_time)) 146 192 return PJ_RETURN_OS_ERROR(GetLastError()); 193 #endif 147 194 148 195 if (!FileTimeToSystemTime(file_time, &localTime)) … … 173 220 PJ_DECL_UNICODE_TEMP_BUF(wfilename,256) 174 221 HANDLE hFile; 175 DWORD sizeLo, sizeHi;176 222 FILETIME creationTime, accessTime, writeTime; 223 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 224 FILE_BASIC_INFO fileInfo; 225 #endif 177 226 178 227 PJ_ASSERT_RETURN(filename!=NULL && stat!=NULL, PJ_EINVAL); 179 228 180 hFile = CreateFile(PJ_STRING_TO_NATIVE(filename,wfilename,sizeof(wfilename)), 181 CONTROL_ACCESS, 182 FILE_SHARE_READ, NULL, 183 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); 229 hFile = create_file(PJ_STRING_TO_NATIVE(filename, 230 wfilename, sizeof(wfilename)), 231 CONTROL_ACCESS, 232 FILE_SHARE_READ, NULL, 233 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); 184 234 if (hFile == INVALID_HANDLE_VALUE) 185 235 return PJ_RETURN_OS_ERROR(GetLastError()); 186 236 187 sizeLo = GetFileSize(hFile, &sizeHi); 188 if (sizeLo == INVALID_FILE_SIZE) { 189 DWORD dwStatus = GetLastError(); 190 if (dwStatus != NO_ERROR) { 191 CloseHandle(hFile); 192 return PJ_RETURN_OS_ERROR(dwStatus); 193 } 194 } 195 196 stat->size = sizeHi; 197 stat->size = (stat->size << 32) + sizeLo; 198 199 if (GetFileTime(hFile, &creationTime, &accessTime, &writeTime)==FALSE) { 200 DWORD dwStatus = GetLastError(); 201 CloseHandle(hFile); 202 return PJ_RETURN_OS_ERROR(dwStatus); 203 } 237 if (get_file_size(hFile, &stat->size) != PJ_SUCCESS) { 238 CloseHandle(hFile); 239 return PJ_RETURN_OS_ERROR(GetLastError()); 240 } 241 242 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 243 if (GetFileInformationByHandleEx(hFile, FileBasicInfo, &fileInfo, 244 sizeof(FILE_BASIC_INFO))) 245 { 246 creationTime.dwLowDateTime = fileInfo.CreationTime.LowPart; 247 creationTime.dwHighDateTime = fileInfo.CreationTime.HighPart; 248 accessTime.dwLowDateTime = fileInfo.LastAccessTime.LowPart; 249 accessTime.dwHighDateTime = fileInfo.LastAccessTime.HighPart; 250 writeTime.dwLowDateTime = fileInfo.LastWriteTime.LowPart; 251 writeTime.dwHighDateTime = fileInfo.LastWriteTime.HighPart; 252 } 253 else { 254 CloseHandle(hFile); 255 return PJ_RETURN_OS_ERROR(GetLastError()); 256 } 257 #else 258 if (GetFileTime(hFile, &creationTime, &accessTime, &writeTime) == FALSE) { 259 DWORD dwStatus = GetLastError(); 260 CloseHandle(hFile); 261 return PJ_RETURN_OS_ERROR(dwStatus); 262 } 263 #endif 204 264 205 265 CloseHandle(hFile); -
pjproject/trunk/pjlib/src/pj/file_io_win32.c
r4537 r5539 22 22 #include <pj/errno.h> 23 23 #include <pj/assert.h> 24 #include <pj/string.h> 24 25 25 26 #include <windows.h> … … 28 29 # define INVALID_SET_FILE_POINTER ((DWORD)-1) 29 30 #endif 31 32 static pj_status_t set_file_pointer(pj_oshandle_t fd, 33 pj_off_t offset, 34 pj_off_t* newPos, 35 DWORD dwMoveMethod) 36 { 37 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 38 LARGE_INTEGER liDistance, liNewPos; 39 40 liDistance.QuadPart = offset; 41 if (!SetFilePointerEx(fd, liDistance, &liNewPos, dwMoveMethod)) { 42 return PJ_RETURN_OS_ERROR(GetLastError()); 43 } 44 *newPos = liNewPos.QuadPart; 45 #else 46 DWORD dwNewPos; 47 LONG hi32; 48 49 hi32 = (LONG)(offset >> 32); 50 51 dwNewPos = SetFilePointer(fd, (long)offset, &hi32, dwMoveMethod); 52 if (dwNewPos == (DWORD)INVALID_SET_FILE_POINTER) { 53 DWORD dwStatus = GetLastError(); 54 if (dwStatus != 0) 55 return PJ_RETURN_OS_ERROR(dwStatus); 56 /* dwNewPos actually is not an error. */ 57 } 58 *newPos = hi32; 59 *newPos = (*newPos << 32) + dwNewPos; 60 #endif 61 62 return PJ_SUCCESS; 63 } 30 64 31 65 /** … … 46 80 pj_oshandle_t *fd) 47 81 { 48 PJ_DECL_UNICODE_TEMP_BUF(wpathname, 256)82 PJ_DECL_UNICODE_TEMP_BUF(wpathname, 256) 49 83 HANDLE hFile; 50 84 DWORD dwDesiredAccess = 0; … … 87 121 88 122 dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; 123 89 124 dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL; 90 125 91 hFile = CreateFile(PJ_STRING_TO_NATIVE(pathname,wpathname,sizeof(wpathname)), 126 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 127 hFile = CreateFile2(PJ_STRING_TO_NATIVE(pathname, 128 wpathname, sizeof(wpathname)), 129 dwDesiredAccess, dwShareMode, dwCreationDisposition, 130 NULL); 131 #else 132 hFile = CreateFile(PJ_STRING_TO_NATIVE(pathname, 133 wpathname, sizeof(wpathname)), 92 134 dwDesiredAccess, dwShareMode, NULL, 93 dwCreationDisposition, dwFlagsAndAttributes, NULL); 135 dwCreationDisposition, dwFlagsAndAttributes, NULL); 136 #endif 137 94 138 if (hFile == INVALID_HANDLE_VALUE) { 139 DWORD lastErr = GetLastError(); 95 140 *fd = 0; 96 return PJ_RETURN_OS_ERROR( GetLastError());141 return PJ_RETURN_OS_ERROR(lastErr); 97 142 } 98 143 … … 181 226 { 182 227 DWORD dwMoveMethod; 183 DWORD dwNewPos; 184 LONG hi32; 228 pj_off_t newPos; 185 229 186 230 if (whence == PJ_SEEK_SET) … … 195 239 } 196 240 197 hi32 = (LONG)(offset >> 32); 198 dwNewPos = SetFilePointer(fd, (long)offset, &hi32, dwMoveMethod); 199 if (dwNewPos == (DWORD)INVALID_SET_FILE_POINTER) { 200 DWORD dwStatus = GetLastError(); 201 if (dwStatus != 0) 202 return PJ_RETURN_OS_ERROR(dwStatus); 203 /* dwNewPos actually is not an error. */ 241 if (set_file_pointer(fd, offset, &newPos, dwMoveMethod) != PJ_SUCCESS) { 242 return PJ_RETURN_OS_ERROR(GetLastError()); 204 243 } 205 244 … … 210 249 pj_off_t *pos) 211 250 { 212 LONG hi32 = 0; 213 DWORD lo32; 214 215 lo32 = SetFilePointer(fd, 0, &hi32, FILE_CURRENT); 216 if (lo32 == (DWORD)INVALID_SET_FILE_POINTER) { 217 DWORD dwStatus = GetLastError(); 218 if (dwStatus != 0) 219 return PJ_RETURN_OS_ERROR(dwStatus); 220 } 221 222 *pos = hi32; 223 *pos = (*pos << 32) + lo32; 251 if (set_file_pointer(fd, 0, pos, FILE_CURRENT) != PJ_SUCCESS) { 252 return PJ_RETURN_OS_ERROR(GetLastError()); 253 } 254 224 255 return PJ_SUCCESS; 225 256 } -
pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c
r5194 r5539 116 116 /* Create mutex for the key. */ 117 117 #if !PJ_IOQUEUE_HAS_SAFE_UNREG 118 rc = pj_lock_create_simple_mutex(poll, NULL, &key->lock); 119 #endif 118 rc = pj_lock_create_simple_mutex(pool, NULL, &key->lock); 120 119 if (rc != PJ_SUCCESS) 121 120 return rc; 121 #endif 122 122 123 123 /* Group lock */ -
pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.h
r4359 r5539 81 81 union operation_key 82 82 { 83 struct generic_operation generic ;83 struct generic_operation generic_op; 84 84 struct read_operation read; 85 85 struct write_operation write; -
pjproject/trunk/pjlib/src/pj/ioqueue_select.c
r5196 r5539 895 895 pj_lock_release(ioqueue->lock); 896 896 897 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 898 count = 0; 899 __try { 900 #endif 901 897 902 count = pj_sock_select(nfds+1, &rfdset, &wfdset, &xfdset, 898 903 timeout); 904 905 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 906 /* Ignore Invalid Handle Exception raised by select().*/ 907 } 908 __except (GetExceptionCode() == STATUS_INVALID_HANDLE ? 909 EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH) { 910 } 911 #endif 899 912 900 913 if (count == 0) -
pjproject/trunk/pjlib/src/pj/os_core_win32.c
r4537 r5539 39 39 #endif 40 40 41 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 42 # include "../../../third_party/threademulation/include/ThreadEmulation.h" 43 #endif 44 41 45 /* Activate mutex related logging if PJ_DEBUG_MUTEX is set, otherwise 42 46 * use default level 6 logging. … … 298 302 PJ_DEF(int) pj_thread_get_prio(pj_thread_t *thread) 299 303 { 304 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 305 PJ_UNUSED_ARG(thread); 306 return -1; 307 #else 300 308 return GetThreadPriority(thread->hthread); 309 #endif 301 310 } 302 311 … … 313 322 PJ_EINVAL); 314 323 324 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 325 if (SetThreadPriorityRT(thread->hthread, prio) == FALSE) 326 #else 315 327 if (SetThreadPriority(thread->hthread, prio) == FALSE) 328 #endif 316 329 return PJ_RETURN_OS_ERROR(GetLastError()); 317 330 … … 474 487 pj_thread_t *rec; 475 488 489 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 490 PJ_UNUSED_ARG(stack_size); 491 #endif 492 476 493 PJ_CHECK_STACK(); 477 494 PJ_ASSERT_RETURN(pool && proc && thread_ptr, PJ_EINVAL); … … 507 524 rec->proc = proc; 508 525 rec->arg = arg; 509 rec->hthread = CreateThread(NULL, stack_size, 510 thread_main, rec, 511 dwflags, &rec->idthread); 526 527 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 528 rec->hthread = CreateThreadRT(NULL, 0, 529 thread_main, rec, 530 dwflags, NULL); 531 #else 532 rec->hthread = CreateThread(NULL, stack_size, 533 thread_main, rec, 534 dwflags, &rec->idthread); 535 #endif 536 512 537 if (rec->hthread == NULL) 513 538 return PJ_RETURN_OS_ERROR(GetLastError()); … … 541 566 PJ_ASSERT_RETURN(p, PJ_EINVAL); 542 567 568 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 569 if (ResumeThreadRT(rec->hthread) == (DWORD)-1) 570 #else 543 571 if (ResumeThread(rec->hthread) == (DWORD)-1) 572 #endif 544 573 return PJ_RETURN_OS_ERROR(GetLastError()); 545 574 else … … 585 614 PJ_LOG(6, (pj_thread_this()->obj_name, "Joining thread %s", p->obj_name)); 586 615 616 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 617 rc = WaitForSingleObjectEx(rec->hthread, INFINITE, FALSE); 618 #else 587 619 rc = WaitForSingleObject(rec->hthread, INFINITE); 620 #endif 588 621 589 622 if (rc==WAIT_OBJECT_0) … … 617 650 { 618 651 PJ_CHECK_STACK(); 652 653 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 654 SleepRT(msec); 655 #else 619 656 Sleep(msec); 657 #endif 658 620 659 return PJ_SUCCESS; 621 660 } … … 811 850 //PJ_CHECK_STACK(); 812 851 852 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 853 *index = TlsAllocRT(); 854 #else 813 855 *index = TlsAlloc(); 856 #endif 814 857 815 858 if (*index == TLS_OUT_OF_INDEXES) … … 825 868 { 826 869 PJ_CHECK_STACK(); 870 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 871 TlsFreeRT(index); 872 #else 827 873 TlsFree(index); 874 #endif 828 875 } 829 876 … … 838 885 //beginning before main thread is initialized. 839 886 //PJ_CHECK_STACK(); 887 888 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 889 rc = TlsSetValueRT(index, value); 890 #else 840 891 rc = TlsSetValue(index, value); 892 #endif 893 841 894 return rc!=0 ? PJ_SUCCESS : PJ_RETURN_OS_ERROR(GetLastError()); 842 895 } … … 850 903 //by PJ_CHECK_STACK() itself!!! 851 904 //PJ_CHECK_STACK(); 905 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 906 return TlsGetValueRT(index); 907 #else 852 908 return TlsGetValue(index); 909 #endif 853 910 } 854 911 … … 859 916 PJ_CHECK_STACK(); 860 917 861 #if PJ_WIN32_WINNT >= 0x0400 918 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 919 InitializeCriticalSectionEx(&mutex->crit, 0, 0); 920 #elif PJ_WIN32_WINNT >= 0x0400 862 921 InitializeCriticalSection(&mutex->crit); 863 922 #else … … 1113 1172 1114 1173 sem = pj_pool_alloc(pool, sizeof(*sem)); 1174 1175 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 1176 /** SEMAPHORE_ALL_ACCESS **/ 1177 sem->hSemaphore = CreateSemaphoreEx(NULL, initial, max, NULL, 0, 1178 SEMAPHORE_ALL_ACCESS); 1179 #else 1115 1180 sem->hSemaphore = CreateSemaphore(NULL, initial, max, NULL); 1181 #endif 1182 1116 1183 if (!sem->hSemaphore) 1117 1184 return PJ_RETURN_OS_ERROR(GetLastError()); … … 1143 1210 LOG_MUTEX((sem->obj_name, "Semaphore: thread %s is waiting", 1144 1211 pj_thread_this()->obj_name)); 1145 1212 1213 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 1214 result = WaitForSingleObjectEx(sem->hSemaphore, timeout, FALSE); 1215 #else 1146 1216 result = WaitForSingleObject(sem->hSemaphore, timeout); 1217 #endif 1218 1147 1219 if (result == WAIT_OBJECT_0) { 1148 1220 LOG_MUTEX((sem->obj_name, "Semaphore acquired by thread %s", … … 1241 1313 return PJ_ENOMEM; 1242 1314 1243 event->hEvent = CreateEvent(NULL, manual_reset?TRUE:FALSE, 1244 initial?TRUE:FALSE, NULL); 1315 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 1316 event->hEvent = CreateEventEx(NULL, NULL, 1317 (manual_reset? 0x1:0x0) | (initial? 0x2:0x0), 1318 EVENT_ALL_ACCESS); 1319 #else 1320 event->hEvent = CreateEvent(NULL, manual_reset ? TRUE : FALSE, 1321 initial ? TRUE : FALSE, NULL); 1322 #endif 1245 1323 1246 1324 if (!event->hEvent) … … 1274 1352 pj_thread_this()->obj_name)); 1275 1353 1354 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 1355 result = WaitForSingleObjectEx(event->hEvent, timeout, FALSE); 1356 #else 1276 1357 result = WaitForSingleObject(event->hEvent, timeout); 1358 #endif 1359 1277 1360 if (result == WAIT_OBJECT_0) { 1278 1361 PJ_LOG(6, (event->obj_name, "Event: thread %s is released", … … 1332 1415 PJ_DEF(pj_status_t) pj_event_pulse(pj_event_t *event) 1333 1416 { 1417 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 1418 PJ_UNUSED_ARG(event); 1419 pj_assert(!"pj_event_pulse() not supported!"); 1420 return PJ_ENOTSUP; 1421 #else 1334 1422 PJ_CHECK_STACK(); 1335 1423 PJ_ASSERT_RETURN(event, PJ_EINVAL); … … 1338 1426 1339 1427 if (PulseEvent(event->hEvent)) 1340 1428 return PJ_SUCCESS; 1341 1429 else 1342 return PJ_RETURN_OS_ERROR(GetLastError()); 1430 return PJ_RETURN_OS_ERROR(GetLastError()); 1431 #endif 1343 1432 } 1344 1433 -
pjproject/trunk/pjlib/src/pj/os_info.c
r5520 r5539 197 197 #elif defined(_MSC_VER) 198 198 { 199 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 200 si.os_name = pj_str("winphone"); 201 #else 199 202 OSVERSIONINFO ovi; 200 203 … … 211 214 si.os_name = pj_str("win32"); 212 215 #endif 216 #endif 213 217 } 214 218 … … 216 220 SYSTEM_INFO wsi; 217 221 222 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 223 GetNativeSystemInfo(&wsi); 224 #else 218 225 GetSystemInfo(&wsi); 226 #endif 227 219 228 switch (wsi.wProcessorArchitecture) { 220 #if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE 229 #if (defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE) || \ 230 (defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8) 221 231 case PROCESSOR_ARCHITECTURE_ARM: 222 232 si.machine = pj_str("arm"); … … 225 235 si.machine = pj_str("shx"); 226 236 break; 227 237 #else 228 238 case PROCESSOR_ARCHITECTURE_AMD64: 229 239 si.machine = pj_str("x86_64"); … … 235 245 si.machine = pj_str("i386"); 236 246 break; 237 247 #endif /* PJ_WIN32_WINCE */ 238 248 } 249 #if defined(PJ_WIN32_WINPHONE8) && PJ_WIN32_WINPHONE8 250 /* Avoid compile warning. */ 251 goto get_sdk_info; 252 #endif 239 253 } 240 254 #elif defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0 -
pjproject/trunk/pjmedia/build/pjmedia.vcxproj
r5432 r5539 2 2 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <ItemGroup Label="ProjectConfigurations"> 4 <ProjectConfiguration Include="Debug-Dynamic|ARM"> 5 <Configuration>Debug-Dynamic</Configuration> 6 <Platform>ARM</Platform> 7 </ProjectConfiguration> 4 8 <ProjectConfiguration Include="Debug-Dynamic|Win32"> 5 9 <Configuration>Debug-Dynamic</Configuration> … … 10 14 <Platform>x64</Platform> 11 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Debug-Static|ARM"> 17 <Configuration>Debug-Static</Configuration> 18 <Platform>ARM</Platform> 19 </ProjectConfiguration> 12 20 <ProjectConfiguration Include="Debug-Static|Win32"> 13 21 <Configuration>Debug-Static</Configuration> … … 18 26 <Platform>x64</Platform> 19 27 </ProjectConfiguration> 28 <ProjectConfiguration Include="Debug|ARM"> 29 <Configuration>Debug</Configuration> 30 <Platform>ARM</Platform> 31 </ProjectConfiguration> 20 32 <ProjectConfiguration Include="Debug|Win32"> 21 33 <Configuration>Debug</Configuration> … … 26 38 <Platform>x64</Platform> 27 39 </ProjectConfiguration> 40 <ProjectConfiguration Include="Release-Dynamic|ARM"> 41 <Configuration>Release-Dynamic</Configuration> 42 <Platform>ARM</Platform> 43 </ProjectConfiguration> 28 44 <ProjectConfiguration Include="Release-Dynamic|Win32"> 29 45 <Configuration>Release-Dynamic</Configuration> … … 34 50 <Platform>x64</Platform> 35 51 </ProjectConfiguration> 52 <ProjectConfiguration Include="Release-Static|ARM"> 53 <Configuration>Release-Static</Configuration> 54 <Platform>ARM</Platform> 55 </ProjectConfiguration> 36 56 <ProjectConfiguration Include="Release-Static|Win32"> 37 57 <Configuration>Release-Static</Configuration> … … 42 62 <Platform>x64</Platform> 43 63 </ProjectConfiguration> 64 <ProjectConfiguration Include="Release|ARM"> 65 <Configuration>Release</Configuration> 66 <Platform>ARM</Platform> 67 </ProjectConfiguration> 44 68 <ProjectConfiguration Include="Release|Win32"> 45 69 <Configuration>Release</Configuration> … … 51 75 </ProjectConfiguration> 52 76 </ItemGroup> 77 <!-- Import common config --> 78 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 79 <PropertyGroup Label="Globals"> 54 80 <ProjectGuid>{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}</ProjectGuid> 55 81 <RootNamespace>pjmedia</RootNamespace> 82 <DefaultLanguage>en-US</DefaultLanguage> 83 <!-- Specific UWP property --> 84 <AppContainerApplication Condition="'$(API_Family)'=='UWP'">true</AppContainerApplication> 85 <ApplicationType Condition="'$(API_Family)'=='UWP'">Windows Store</ApplicationType> 86 <WindowsTargetPlatformVersion Condition="'$(API_Family)'=='UWP'">$(PlatformVersion)</WindowsTargetPlatformVersion> 87 <WindowsTargetPlatformMinVersion Condition="'$(API_Family)'=='UWP'">$(PlatformVersion)</WindowsTargetPlatformMinVersion> 88 <ApplicationTypeRevision Condition="'$(API_Family)'=='UWP'">$(AppTypeRev)</ApplicationTypeRevision> 56 89 </PropertyGroup> 57 90 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 62 95 <CharacterSet>MultiByte</CharacterSet> 63 96 </PropertyGroup> 97 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 98 <ConfigurationType>StaticLibrary</ConfigurationType> 99 <PlatformToolset>v140</PlatformToolset> 100 <UseOfMfc>false</UseOfMfc> 101 <CharacterSet>MultiByte</CharacterSet> 102 </PropertyGroup> 64 103 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 65 104 <ConfigurationType>StaticLibrary</ConfigurationType> … … 68 107 <CharacterSet>MultiByte</CharacterSet> 69 108 </PropertyGroup> 109 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 110 <ConfigurationType>StaticLibrary</ConfigurationType> 111 <PlatformToolset>v140</PlatformToolset> 112 <UseOfMfc>false</UseOfMfc> 113 <CharacterSet>MultiByte</CharacterSet> 114 </PropertyGroup> 70 115 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 71 116 <ConfigurationType>StaticLibrary</ConfigurationType> … … 74 119 <CharacterSet>MultiByte</CharacterSet> 75 120 </PropertyGroup> 121 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 122 <ConfigurationType>StaticLibrary</ConfigurationType> 123 <PlatformToolset>v140</PlatformToolset> 124 <UseOfMfc>false</UseOfMfc> 125 <CharacterSet>MultiByte</CharacterSet> 126 </PropertyGroup> 76 127 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 77 128 <ConfigurationType>StaticLibrary</ConfigurationType> … … 80 131 <CharacterSet>MultiByte</CharacterSet> 81 132 </PropertyGroup> 133 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 134 <ConfigurationType>StaticLibrary</ConfigurationType> 135 <PlatformToolset>v140</PlatformToolset> 136 <UseOfMfc>false</UseOfMfc> 137 <CharacterSet>MultiByte</CharacterSet> 138 </PropertyGroup> 82 139 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 83 140 <ConfigurationType>StaticLibrary</ConfigurationType> … … 86 143 <CharacterSet>MultiByte</CharacterSet> 87 144 </PropertyGroup> 145 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 146 <ConfigurationType>StaticLibrary</ConfigurationType> 147 <PlatformToolset>v140</PlatformToolset> 148 <UseOfMfc>false</UseOfMfc> 149 <CharacterSet>MultiByte</CharacterSet> 150 </PropertyGroup> 88 151 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 89 152 <ConfigurationType>StaticLibrary</ConfigurationType> … … 92 155 <CharacterSet>MultiByte</CharacterSet> 93 156 </PropertyGroup> 157 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 158 <ConfigurationType>StaticLibrary</ConfigurationType> 159 <PlatformToolset>v140</PlatformToolset> 160 <UseOfMfc>false</UseOfMfc> 161 <CharacterSet>MultiByte</CharacterSet> 162 </PropertyGroup> 94 163 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 95 164 <ConfigurationType>StaticLibrary</ConfigurationType> … … 128 197 <CharacterSet>MultiByte</CharacterSet> 129 198 </PropertyGroup> 199 <!-- Override the PlatformToolset --> 200 <PropertyGroup> 201 <PlatformToolset>$(BuildToolset)</PlatformToolset> 202 <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 203 </PropertyGroup> 130 204 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 131 205 <ImportGroup Label="ExtensionSettings"> … … 136 210 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 137 211 </ImportGroup> 212 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 213 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 214 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 215 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 216 </ImportGroup> 138 217 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 139 218 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 141 220 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 142 221 </ImportGroup> 222 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 223 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 224 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 225 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 226 </ImportGroup> 143 227 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 144 228 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 146 230 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 147 231 </ImportGroup> 232 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 233 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 234 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 235 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 236 </ImportGroup> 148 237 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 149 238 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 151 240 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 152 241 </ImportGroup> 242 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 243 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 244 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 245 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 246 </ImportGroup> 153 247 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 154 248 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 156 250 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 157 251 </ImportGroup> 252 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 253 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 254 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 255 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 256 </ImportGroup> 158 257 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 159 258 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 161 260 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 162 261 </ImportGroup> 262 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 263 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 264 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 265 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 266 </ImportGroup> 163 267 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 164 268 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 193 297 <PropertyGroup Label="UserMacros" /> 194 298 <PropertyGroup> 195 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 196 </PropertyGroup> 299 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 300 </PropertyGroup> 301 <!-- Compile and link option definition --> 302 <ItemDefinitionGroup> 303 <ClCompile> 304 <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 305 </ClCompile> 306 </ItemDefinitionGroup> 197 307 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 198 308 <ClCompile> … … 200 310 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 201 311 <PrecompiledHeaderOutputFile /> 312 </ClCompile> 313 </ItemDefinitionGroup> 314 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 315 <ClCompile> 316 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 317 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 318 <PrecompiledHeaderOutputFile> 319 </PrecompiledHeaderOutputFile> 202 320 </ClCompile> 203 321 </ItemDefinitionGroup> … … 219 337 </ClCompile> 220 338 </ItemDefinitionGroup> 339 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 340 <ClCompile> 341 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 342 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 343 <PrecompiledHeaderOutputFile> 344 </PrecompiledHeaderOutputFile> 345 </ClCompile> 346 </ItemDefinitionGroup> 221 347 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 222 348 <Midl> … … 237 363 </ClCompile> 238 364 </ItemDefinitionGroup> 365 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 366 <ClCompile> 367 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 368 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 369 <PrecompiledHeaderOutputFile> 370 </PrecompiledHeaderOutputFile> 371 </ClCompile> 372 </ItemDefinitionGroup> 239 373 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 240 374 <Midl> … … 255 389 </ClCompile> 256 390 </ItemDefinitionGroup> 391 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 392 <ClCompile> 393 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 394 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 395 <PrecompiledHeaderOutputFile> 396 </PrecompiledHeaderOutputFile> 397 </ClCompile> 398 </ItemDefinitionGroup> 257 399 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 258 400 <Midl> … … 272 414 </ClCompile> 273 415 </ItemDefinitionGroup> 416 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 417 <ClCompile> 418 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 419 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 420 <PrecompiledHeaderOutputFile> 421 </PrecompiledHeaderOutputFile> 422 </ClCompile> 423 </ItemDefinitionGroup> 274 424 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 275 425 <Midl> … … 288 438 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 289 439 <PrecompiledHeaderOutputFile /> 440 </ClCompile> 441 </ItemDefinitionGroup> 442 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 443 <ClCompile> 444 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 445 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 446 <PrecompiledHeaderOutputFile> 447 </PrecompiledHeaderOutputFile> 290 448 </ClCompile> 291 449 </ItemDefinitionGroup> -
pjproject/trunk/pjmedia/build/pjmedia_audiodev.vcxproj
r5168 r5539 2 2 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <ItemGroup Label="ProjectConfigurations"> 4 <ProjectConfiguration Include="Debug-Dynamic|ARM"> 5 <Configuration>Debug-Dynamic</Configuration> 6 <Platform>ARM</Platform> 7 </ProjectConfiguration> 4 8 <ProjectConfiguration Include="Debug-Dynamic|Win32"> 5 9 <Configuration>Debug-Dynamic</Configuration> … … 10 14 <Platform>x64</Platform> 11 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Debug-Static|ARM"> 17 <Configuration>Debug-Static</Configuration> 18 <Platform>ARM</Platform> 19 </ProjectConfiguration> 12 20 <ProjectConfiguration Include="Debug-Static|Win32"> 13 21 <Configuration>Debug-Static</Configuration> … … 18 26 <Platform>x64</Platform> 19 27 </ProjectConfiguration> 28 <ProjectConfiguration Include="Debug|ARM"> 29 <Configuration>Debug</Configuration> 30 <Platform>ARM</Platform> 31 </ProjectConfiguration> 20 32 <ProjectConfiguration Include="Debug|Win32"> 21 33 <Configuration>Debug</Configuration> … … 26 38 <Platform>x64</Platform> 27 39 </ProjectConfiguration> 40 <ProjectConfiguration Include="Release-Dynamic|ARM"> 41 <Configuration>Release-Dynamic</Configuration> 42 <Platform>ARM</Platform> 43 </ProjectConfiguration> 28 44 <ProjectConfiguration Include="Release-Dynamic|Win32"> 29 45 <Configuration>Release-Dynamic</Configuration> … … 34 50 <Platform>x64</Platform> 35 51 </ProjectConfiguration> 52 <ProjectConfiguration Include="Release-Static|ARM"> 53 <Configuration>Release-Static</Configuration> 54 <Platform>ARM</Platform> 55 </ProjectConfiguration> 36 56 <ProjectConfiguration Include="Release-Static|Win32"> 37 57 <Configuration>Release-Static</Configuration> … … 42 62 <Platform>x64</Platform> 43 63 </ProjectConfiguration> 64 <ProjectConfiguration Include="Release|ARM"> 65 <Configuration>Release</Configuration> 66 <Platform>ARM</Platform> 67 </ProjectConfiguration> 44 68 <ProjectConfiguration Include="Release|Win32"> 45 69 <Configuration>Release</Configuration> … … 51 75 </ProjectConfiguration> 52 76 </ItemGroup> 77 <!-- Import common config --> 78 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 79 <PropertyGroup Label="Globals"> 54 80 <ProjectGuid>{4281CA5E-1D48-45D4-A991-2718A454B4BA}</ProjectGuid> 55 <RootNamespace>pjmedia_audiodev</RootNamespace> 81 <RootNamespace>pjmedia_audiodev</RootNamespace> 82 <!-- Specific UWP property --> 83 <DefaultLanguage>en-US</DefaultLanguage> 56 84 </PropertyGroup> 57 85 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 62 90 <CharacterSet>MultiByte</CharacterSet> 63 91 </PropertyGroup> 92 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 93 <ConfigurationType>StaticLibrary</ConfigurationType> 94 <PlatformToolset>v140</PlatformToolset> 95 <UseOfMfc>false</UseOfMfc> 96 <CharacterSet>MultiByte</CharacterSet> 97 </PropertyGroup> 64 98 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 65 99 <ConfigurationType>StaticLibrary</ConfigurationType> … … 68 102 <CharacterSet>MultiByte</CharacterSet> 69 103 </PropertyGroup> 104 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 105 <ConfigurationType>StaticLibrary</ConfigurationType> 106 <PlatformToolset>v140</PlatformToolset> 107 <UseOfMfc>false</UseOfMfc> 108 <CharacterSet>MultiByte</CharacterSet> 109 </PropertyGroup> 70 110 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 71 111 <ConfigurationType>StaticLibrary</ConfigurationType> … … 74 114 <CharacterSet>MultiByte</CharacterSet> 75 115 </PropertyGroup> 116 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 117 <ConfigurationType>StaticLibrary</ConfigurationType> 118 <PlatformToolset>v140</PlatformToolset> 119 <UseOfMfc>false</UseOfMfc> 120 <CharacterSet>MultiByte</CharacterSet> 121 </PropertyGroup> 76 122 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 77 123 <ConfigurationType>StaticLibrary</ConfigurationType> … … 80 126 <CharacterSet>MultiByte</CharacterSet> 81 127 </PropertyGroup> 128 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 129 <ConfigurationType>StaticLibrary</ConfigurationType> 130 <PlatformToolset>v140</PlatformToolset> 131 <UseOfMfc>false</UseOfMfc> 132 <CharacterSet>MultiByte</CharacterSet> 133 </PropertyGroup> 82 134 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 83 135 <ConfigurationType>StaticLibrary</ConfigurationType> … … 86 138 <CharacterSet>MultiByte</CharacterSet> 87 139 </PropertyGroup> 140 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 141 <ConfigurationType>StaticLibrary</ConfigurationType> 142 <PlatformToolset>v140</PlatformToolset> 143 <UseOfMfc>false</UseOfMfc> 144 <CharacterSet>MultiByte</CharacterSet> 145 </PropertyGroup> 88 146 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 89 147 <ConfigurationType>StaticLibrary</ConfigurationType> … … 92 150 <CharacterSet>MultiByte</CharacterSet> 93 151 </PropertyGroup> 152 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 153 <ConfigurationType>StaticLibrary</ConfigurationType> 154 <PlatformToolset>v140</PlatformToolset> 155 <UseOfMfc>false</UseOfMfc> 156 <CharacterSet>MultiByte</CharacterSet> 157 </PropertyGroup> 94 158 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 95 159 <ConfigurationType>StaticLibrary</ConfigurationType> … … 127 191 <UseOfMfc>false</UseOfMfc> 128 192 <CharacterSet>MultiByte</CharacterSet> 193 </PropertyGroup> 194 <!-- Override the PlatformToolset --> 195 <PropertyGroup> 196 <PlatformToolset>$(BuildToolset)</PlatformToolset> 197 <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 129 198 </PropertyGroup> 130 199 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 131 200 <ImportGroup Label="ExtensionSettings"> 132 201 </ImportGroup> 133 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 134 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 135 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 136 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 202 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 203 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 204 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 205 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 206 </ImportGroup> 207 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 208 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 209 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 210 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 137 211 </ImportGroup> 138 212 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 139 213 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 140 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 141 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 214 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 215 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 216 </ImportGroup> 217 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 218 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 219 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 220 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 142 221 </ImportGroup> 143 222 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 144 223 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 145 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 146 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 224 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 225 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 226 </ImportGroup> 227 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 228 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 229 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 230 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 147 231 </ImportGroup> 148 232 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 149 233 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 150 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 151 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 234 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 235 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 236 </ImportGroup> 237 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 238 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 239 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 240 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 152 241 </ImportGroup> 153 242 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 154 243 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 155 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 156 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 244 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 245 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 246 </ImportGroup> 247 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 248 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 249 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 250 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 157 251 </ImportGroup> 158 252 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 159 253 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 160 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 161 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 254 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 255 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 256 </ImportGroup> 257 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 258 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 259 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 260 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 162 261 </ImportGroup> 163 262 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 164 263 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 165 166 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 264 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 265 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 167 266 </ImportGroup> 168 267 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 169 268 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 170 171 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 269 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 270 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 172 271 </ImportGroup> 173 272 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 174 273 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 175 176 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 274 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 275 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 177 276 </ImportGroup> 178 277 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 179 278 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 180 181 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 279 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 280 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 182 281 </ImportGroup> 183 282 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 184 283 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 185 186 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 284 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 285 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 187 286 </ImportGroup> 188 287 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 189 288 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 190 191 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 289 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 290 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 192 291 </ImportGroup> 193 292 <PropertyGroup Label="UserMacros" /> 194 293 <PropertyGroup> 195 294 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 196 <TargetName>pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 197 </PropertyGroup> 295 <TargetName>pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 296 </PropertyGroup> 297 <!-- Compile and link option definition --> 298 <ItemDefinitionGroup> 299 <ClCompile> 300 <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 301 </ClCompile> 302 </ItemDefinitionGroup> 198 303 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 199 304 <ClCompile> … … 201 306 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 202 307 <PrecompiledHeaderOutputFile /> 308 </ClCompile> 309 <Lib> 310 <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 311 </Lib> 312 </ItemDefinitionGroup> 313 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 314 <ClCompile> 315 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 316 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 317 <PrecompiledHeaderOutputFile> 318 </PrecompiledHeaderOutputFile> 203 319 </ClCompile> 204 320 <Lib> … … 230 346 </Lib> 231 347 </ItemDefinitionGroup> 348 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 349 <ClCompile> 350 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 351 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 352 <PrecompiledHeaderOutputFile> 353 </PrecompiledHeaderOutputFile> 354 </ClCompile> 355 <Lib> 356 <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 357 </Lib> 358 </ItemDefinitionGroup> 232 359 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 233 360 <Midl> … … 253 380 </Lib> 254 381 </ItemDefinitionGroup> 382 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 383 <ClCompile> 384 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 385 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 386 <PrecompiledHeaderOutputFile> 387 </PrecompiledHeaderOutputFile> 388 </ClCompile> 389 <Lib> 390 <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 391 </Lib> 392 </ItemDefinitionGroup> 255 393 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 256 394 <Midl> … … 277 415 </Lib> 278 416 </ItemDefinitionGroup> 417 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 418 <ClCompile> 419 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 420 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 421 <PrecompiledHeaderOutputFile> 422 </PrecompiledHeaderOutputFile> 423 </ClCompile> 424 <Lib> 425 <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 426 </Lib> 427 </ItemDefinitionGroup> 279 428 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 280 429 <Midl> … … 300 449 </Lib> 301 450 </ItemDefinitionGroup> 451 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 452 <ClCompile> 453 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 454 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 455 <PrecompiledHeaderOutputFile> 456 </PrecompiledHeaderOutputFile> 457 </ClCompile> 458 <Lib> 459 <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 460 </Lib> 461 </ItemDefinitionGroup> 302 462 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 303 463 <Midl> … … 319 479 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 320 480 <PrecompiledHeaderOutputFile /> 481 </ClCompile> 482 <Lib> 483 <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 484 </Lib> 485 </ItemDefinitionGroup> 486 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 487 <ClCompile> 488 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 489 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 490 <PrecompiledHeaderOutputFile> 491 </PrecompiledHeaderOutputFile> 321 492 </ClCompile> 322 493 <Lib> … … 347 518 <ClCompile Include="..\src\pjmedia-audiodev\symb_aps_dev.cpp"> 348 519 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 520 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 349 521 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 350 522 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 523 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 351 524 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 352 525 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 526 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 353 527 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 354 528 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 529 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 355 530 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 356 531 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 532 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 357 533 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 358 534 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 535 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 359 536 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 360 537 </ClCompile> 361 538 <ClCompile Include="..\src\pjmedia-audiodev\symb_mda_dev.cpp"> 362 539 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 540 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 363 541 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 364 542 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 543 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 365 544 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 366 545 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 546 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 367 547 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 368 548 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 549 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 369 550 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 370 551 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 552 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 371 553 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 372 554 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 555 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 373 556 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 374 557 </ClCompile> 375 558 <ClCompile Include="..\src\pjmedia-audiodev\symb_vas_dev.cpp"> 376 559 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 560 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 377 561 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 378 562 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 563 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 379 564 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 380 565 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 566 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 381 567 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 382 568 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 569 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 383 570 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 384 571 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 572 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 385 573 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 386 574 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 575 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 387 576 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 577 </ClCompile> 578 <ClCompile Condition="'$(API_Family)'!='WinDesktop'" Include="..\src\pjmedia-audiodev\wasapi_dev.cpp"> 579 <CompileAsWinRT>true</CompileAsWinRT> 580 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 581 <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</CompileAsWinRT> 582 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 583 <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT> 584 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 585 <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</CompileAsWinRT> 586 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 587 <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT> 588 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 589 <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</CompileAsWinRT> 590 <AdditionalUsingDirectories Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">$(WindowsSDK_MetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> 591 <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</CompileAsWinRT> 592 <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">MultiThreadedDebugDLL</RuntimeLibrary> 593 <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">MultiThreadedDebugDLL</RuntimeLibrary> 594 <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MultiThreadedDLL</RuntimeLibrary> 388 595 </ClCompile> 389 596 <ClCompile Include="..\src\pjmedia-audiodev\wmme_dev.c" /> -
pjproject/trunk/pjmedia/build/pjmedia_audiodev.vcxproj.filters
r5181 r5539 45 45 <Filter>Source Files</Filter> 46 46 </ClCompile> 47 <ClCompile Include="..\src\pjmedia-audiodev\wasapi_dev.cpp"> 48 <Filter>Source Files</Filter> 49 </ClCompile> 47 50 </ItemGroup> 48 51 <ItemGroup> -
pjproject/trunk/pjmedia/build/pjmedia_codec.vcxproj
r5422 r5539 2 2 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <ItemGroup Label="ProjectConfigurations"> 4 <ProjectConfiguration Include="Debug-Dynamic|ARM"> 5 <Configuration>Debug-Dynamic</Configuration> 6 <Platform>ARM</Platform> 7 </ProjectConfiguration> 4 8 <ProjectConfiguration Include="Debug-Dynamic|Win32"> 5 9 <Configuration>Debug-Dynamic</Configuration> … … 10 14 <Platform>x64</Platform> 11 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Debug-Static|ARM"> 17 <Configuration>Debug-Static</Configuration> 18 <Platform>ARM</Platform> 19 </ProjectConfiguration> 12 20 <ProjectConfiguration Include="Debug-Static|Win32"> 13 21 <Configuration>Debug-Static</Configuration> … … 18 26 <Platform>x64</Platform> 19 27 </ProjectConfiguration> 28 <ProjectConfiguration Include="Debug|ARM"> 29 <Configuration>Debug</Configuration> 30 <Platform>ARM</Platform> 31 </ProjectConfiguration> 20 32 <ProjectConfiguration Include="Debug|Win32"> 21 33 <Configuration>Debug</Configuration> … … 26 38 <Platform>x64</Platform> 27 39 </ProjectConfiguration> 40 <ProjectConfiguration Include="Release-Dynamic|ARM"> 41 <Configuration>Release-Dynamic</Configuration> 42 <Platform>ARM</Platform> 43 </ProjectConfiguration> 28 44 <ProjectConfiguration Include="Release-Dynamic|Win32"> 29 45 <Configuration>Release-Dynamic</Configuration> … … 34 50 <Platform>x64</Platform> 35 51 </ProjectConfiguration> 52 <ProjectConfiguration Include="Release-Static|ARM"> 53 <Configuration>Release-Static</Configuration> 54 <Platform>ARM</Platform> 55 </ProjectConfiguration> 36 56 <ProjectConfiguration Include="Release-Static|Win32"> 37 57 <Configuration>Release-Static</Configuration> … … 42 62 <Platform>x64</Platform> 43 63 </ProjectConfiguration> 64 <ProjectConfiguration Include="Release|ARM"> 65 <Configuration>Release</Configuration> 66 <Platform>ARM</Platform> 67 </ProjectConfiguration> 44 68 <ProjectConfiguration Include="Release|Win32"> 45 69 <Configuration>Release</Configuration> … … 51 75 </ProjectConfiguration> 52 76 </ItemGroup> 77 <!-- Import common config --> 78 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 79 <PropertyGroup Label="Globals"> 54 80 <ProjectGuid>{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}</ProjectGuid> 55 81 <RootNamespace>pjmedia_codec</RootNamespace> 82 <DefaultLanguage>en-US</DefaultLanguage> 83 <!-- Specific UWP property --> 56 84 </PropertyGroup> 57 85 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 62 90 <CharacterSet>MultiByte</CharacterSet> 63 91 </PropertyGroup> 92 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 93 <ConfigurationType>StaticLibrary</ConfigurationType> 94 <PlatformToolset>v140</PlatformToolset> 95 <UseOfMfc>false</UseOfMfc> 96 <CharacterSet>MultiByte</CharacterSet> 97 </PropertyGroup> 64 98 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 65 99 <ConfigurationType>StaticLibrary</ConfigurationType> … … 68 102 <CharacterSet>MultiByte</CharacterSet> 69 103 </PropertyGroup> 104 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 105 <ConfigurationType>StaticLibrary</ConfigurationType> 106 <PlatformToolset>v140</PlatformToolset> 107 <UseOfMfc>false</UseOfMfc> 108 <CharacterSet>MultiByte</CharacterSet> 109 </PropertyGroup> 70 110 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 71 111 <ConfigurationType>StaticLibrary</ConfigurationType> … … 74 114 <CharacterSet>MultiByte</CharacterSet> 75 115 </PropertyGroup> 116 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 117 <ConfigurationType>StaticLibrary</ConfigurationType> 118 <PlatformToolset>v140</PlatformToolset> 119 <UseOfMfc>false</UseOfMfc> 120 <CharacterSet>MultiByte</CharacterSet> 121 </PropertyGroup> 76 122 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 77 123 <ConfigurationType>StaticLibrary</ConfigurationType> … … 80 126 <CharacterSet>MultiByte</CharacterSet> 81 127 </PropertyGroup> 128 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 129 <ConfigurationType>StaticLibrary</ConfigurationType> 130 <PlatformToolset>v140</PlatformToolset> 131 <UseOfMfc>false</UseOfMfc> 132 <CharacterSet>MultiByte</CharacterSet> 133 </PropertyGroup> 82 134 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 83 135 <ConfigurationType>StaticLibrary</ConfigurationType> … … 86 138 <CharacterSet>MultiByte</CharacterSet> 87 139 </PropertyGroup> 140 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 141 <ConfigurationType>StaticLibrary</ConfigurationType> 142 <PlatformToolset>v140</PlatformToolset> 143 <UseOfMfc>false</UseOfMfc> 144 <CharacterSet>MultiByte</CharacterSet> 145 </PropertyGroup> 88 146 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 89 147 <ConfigurationType>StaticLibrary</ConfigurationType> … … 92 150 <CharacterSet>MultiByte</CharacterSet> 93 151 </PropertyGroup> 152 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 153 <ConfigurationType>StaticLibrary</ConfigurationType> 154 <PlatformToolset>v140</PlatformToolset> 155 <UseOfMfc>false</UseOfMfc> 156 <CharacterSet>MultiByte</CharacterSet> 157 </PropertyGroup> 94 158 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 95 159 <ConfigurationType>StaticLibrary</ConfigurationType> … … 128 192 <CharacterSet>MultiByte</CharacterSet> 129 193 </PropertyGroup> 194 <!-- Override the PlatformToolset --> 195 <PropertyGroup> 196 <PlatformToolset>$(BuildToolset)</PlatformToolset> 197 <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 198 </PropertyGroup> 130 199 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 131 200 <ImportGroup Label="ExtensionSettings"> … … 136 205 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 137 206 </ImportGroup> 207 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 208 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 209 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 210 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 211 </ImportGroup> 138 212 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 139 213 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 141 215 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 142 216 </ImportGroup> 217 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 218 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 219 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 220 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 221 </ImportGroup> 143 222 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 144 223 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 146 225 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 147 226 </ImportGroup> 227 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 228 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 229 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 230 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 231 </ImportGroup> 148 232 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 149 233 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 151 235 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 152 236 </ImportGroup> 237 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 238 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 239 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 240 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 241 </ImportGroup> 153 242 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 154 243 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 156 245 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 157 246 </ImportGroup> 247 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 248 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 249 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 250 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 251 </ImportGroup> 158 252 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 159 253 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 160 254 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 255 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 256 </ImportGroup> 257 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 258 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 259 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 161 260 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 162 261 </ImportGroup> … … 196 295 <TargetName>pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 197 296 </PropertyGroup> 297 <!-- Compile and link option definition --> 298 <ItemDefinitionGroup> 299 <ClCompile> 300 <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 301 </ClCompile> 302 </ItemDefinitionGroup> 198 303 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 199 304 <ClCompile> … … 201 306 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 202 307 <PrecompiledHeaderOutputFile /> 308 </ClCompile> 309 <Lib> 310 <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 311 </Lib> 312 </ItemDefinitionGroup> 313 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 314 <ClCompile> 315 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 316 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 317 <PrecompiledHeaderOutputFile> 318 </PrecompiledHeaderOutputFile> 203 319 </ClCompile> 204 320 <Lib> … … 230 346 </Lib> 231 347 </ItemDefinitionGroup> 348 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 349 <ClCompile> 350 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 351 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 352 <PrecompiledHeaderOutputFile> 353 </PrecompiledHeaderOutputFile> 354 </ClCompile> 355 <Lib> 356 <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 357 </Lib> 358 </ItemDefinitionGroup> 232 359 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 233 360 <Midl> … … 253 380 </Lib> 254 381 </ItemDefinitionGroup> 382 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 383 <ClCompile> 384 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 385 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 386 <PrecompiledHeaderOutputFile> 387 </PrecompiledHeaderOutputFile> 388 </ClCompile> 389 <Lib> 390 <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 391 </Lib> 392 </ItemDefinitionGroup> 255 393 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 256 394 <Midl> … … 277 415 </Lib> 278 416 </ItemDefinitionGroup> 417 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 418 <ClCompile> 419 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 420 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 421 <PrecompiledHeaderOutputFile> 422 </PrecompiledHeaderOutputFile> 423 </ClCompile> 424 <Lib> 425 <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 426 </Lib> 427 </ItemDefinitionGroup> 279 428 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 280 429 <Midl> … … 300 449 </Lib> 301 450 </ItemDefinitionGroup> 451 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 452 <ClCompile> 453 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 454 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 455 <PrecompiledHeaderOutputFile> 456 </PrecompiledHeaderOutputFile> 457 </ClCompile> 458 <Lib> 459 <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 460 </Lib> 461 </ItemDefinitionGroup> 302 462 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 303 463 <Midl> … … 319 479 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 320 480 <PrecompiledHeaderOutputFile /> 481 </ClCompile> 482 <Lib> 483 <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 484 </Lib> 485 </ItemDefinitionGroup> 486 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 487 <ClCompile> 488 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 489 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 490 <PrecompiledHeaderOutputFile> 491 </PrecompiledHeaderOutputFile> 321 492 </ClCompile> 322 493 <Lib> -
pjproject/trunk/pjmedia/build/pjmedia_test.vcxproj
r5168 r5539 51 51 </ProjectConfiguration> 52 52 </ItemGroup> 53 <!-- Import common config --> 54 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 55 <PropertyGroup Label="Globals"> 54 56 <ProjectGuid>{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}</ProjectGuid> 55 <RootNamespace>pjmedia_test</RootNamespace> 57 <RootNamespace>pjmedia_test</RootNamespace> 58 <!-- Specific UWP property --> 59 <DefaultLanguage>en-US</DefaultLanguage> 56 60 </PropertyGroup> 57 61 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 128 132 <CharacterSet>MultiByte</CharacterSet> 129 133 </PropertyGroup> 134 <!-- Override the PlatformToolset --> 135 <PropertyGroup> 136 <PlatformToolset>$(BuildToolset)</PlatformToolset> 137 <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 138 <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType> 139 <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType> 140 </PropertyGroup> 130 141 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 131 142 <ImportGroup Label="ExtensionSettings"> 132 143 </ImportGroup> 133 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">144 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 134 145 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 135 146 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> … … 194 205 <PropertyGroup> 195 206 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 196 <TargetName>pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 197 </PropertyGroup> 207 <TargetName>pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 208 </PropertyGroup> 209 <!-- Compile and link option definition --> 210 <ItemDefinitionGroup> 211 <ClCompile> 212 <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 213 </ClCompile> 214 <Lib> 215 <OutputFile>..\lib\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 216 </Lib> 217 </ItemDefinitionGroup> 198 218 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 199 219 <ClCompile> -
pjproject/trunk/pjmedia/build/pjmedia_videodev.vcxproj
r5168 r5539 2 2 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <ItemGroup Label="ProjectConfigurations"> 4 <ProjectConfiguration Include="Debug-Dynamic|ARM"> 5 <Configuration>Debug-Dynamic</Configuration> 6 <Platform>ARM</Platform> 7 </ProjectConfiguration> 4 8 <ProjectConfiguration Include="Debug-Dynamic|Win32"> 5 9 <Configuration>Debug-Dynamic</Configuration> … … 10 14 <Platform>x64</Platform> 11 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Debug-Static|ARM"> 17 <Configuration>Debug-Static</Configuration> 18 <Platform>ARM</Platform> 19 </ProjectConfiguration> 12 20 <ProjectConfiguration Include="Debug-Static|Win32"> 13 21 <Configuration>Debug-Static</Configuration> … … 18 26 <Platform>x64</Platform> 19 27 </ProjectConfiguration> 28 <ProjectConfiguration Include="Debug|ARM"> 29 <Configuration>Debug</Configuration> 30 <Platform>ARM</Platform> 31 </ProjectConfiguration> 20 32 <ProjectConfiguration Include="Debug|Win32"> 21 33 <Configuration>Debug</Configuration> … … 26 38 <Platform>x64</Platform> 27 39 </ProjectConfiguration> 40 <ProjectConfiguration Include="Release-Dynamic|ARM"> 41 <Configuration>Release-Dynamic</Configuration> 42 <Platform>ARM</Platform> 43 </ProjectConfiguration> 28 44 <ProjectConfiguration Include="Release-Dynamic|Win32"> 29 45 <Configuration>Release-Dynamic</Configuration> … … 34 50 <Platform>x64</Platform> 35 51 </ProjectConfiguration> 52 <ProjectConfiguration Include="Release-Static|ARM"> 53 <Configuration>Release-Static</Configuration> 54 <Platform>ARM</Platform> 55 </ProjectConfiguration> 36 56 <ProjectConfiguration Include="Release-Static|Win32"> 37 57 <Configuration>Release-Static</Configuration> … … 42 62 <Platform>x64</Platform> 43 63 </ProjectConfiguration> 64 <ProjectConfiguration Include="Release|ARM"> 65 <Configuration>Release</Configuration> 66 <Platform>ARM</Platform> 67 </ProjectConfiguration> 44 68 <ProjectConfiguration Include="Release|Win32"> 45 69 <Configuration>Release</Configuration> … … 51 75 </ProjectConfiguration> 52 76 </ItemGroup> 77 <!-- Import common config --> 78 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 79 <PropertyGroup Label="Globals"> 54 80 <ProjectGuid>{A1989FF3-9894-40F4-B5A6-6EA364476E45}</ProjectGuid> 55 81 <RootNamespace>pjmedia_audiodev</RootNamespace> 82 <DefaultLanguage>en-US</DefaultLanguage> 83 <!-- Specific UWP property --> 56 84 </PropertyGroup> 57 85 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 62 90 <CharacterSet>MultiByte</CharacterSet> 63 91 </PropertyGroup> 92 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 93 <ConfigurationType>StaticLibrary</ConfigurationType> 94 <PlatformToolset>v140</PlatformToolset> 95 <UseOfMfc>false</UseOfMfc> 96 <CharacterSet>MultiByte</CharacterSet> 97 </PropertyGroup> 64 98 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 65 99 <ConfigurationType>StaticLibrary</ConfigurationType> … … 68 102 <CharacterSet>MultiByte</CharacterSet> 69 103 </PropertyGroup> 104 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 105 <ConfigurationType>StaticLibrary</ConfigurationType> 106 <PlatformToolset>v140</PlatformToolset> 107 <UseOfMfc>false</UseOfMfc> 108 <CharacterSet>MultiByte</CharacterSet> 109 </PropertyGroup> 70 110 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration"> 71 111 <ConfigurationType>StaticLibrary</ConfigurationType> … … 74 114 <CharacterSet>MultiByte</CharacterSet> 75 115 </PropertyGroup> 116 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 117 <ConfigurationType>StaticLibrary</ConfigurationType> 118 <PlatformToolset>v140</PlatformToolset> 119 <UseOfMfc>false</UseOfMfc> 120 <CharacterSet>MultiByte</CharacterSet> 121 </PropertyGroup> 76 122 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration"> 77 123 <ConfigurationType>StaticLibrary</ConfigurationType> … … 80 126 <CharacterSet>MultiByte</CharacterSet> 81 127 </PropertyGroup> 128 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 129 <ConfigurationType>StaticLibrary</ConfigurationType> 130 <PlatformToolset>v140</PlatformToolset> 131 <UseOfMfc>false</UseOfMfc> 132 <CharacterSet>MultiByte</CharacterSet> 133 </PropertyGroup> 82 134 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 83 135 <ConfigurationType>StaticLibrary</ConfigurationType> … … 86 138 <CharacterSet>MultiByte</CharacterSet> 87 139 </PropertyGroup> 140 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 141 <ConfigurationType>StaticLibrary</ConfigurationType> 142 <PlatformToolset>v140</PlatformToolset> 143 <UseOfMfc>false</UseOfMfc> 144 <CharacterSet>MultiByte</CharacterSet> 145 </PropertyGroup> 88 146 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 89 147 <ConfigurationType>StaticLibrary</ConfigurationType> … … 92 150 <CharacterSet>MultiByte</CharacterSet> 93 151 </PropertyGroup> 152 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 153 <ConfigurationType>StaticLibrary</ConfigurationType> 154 <PlatformToolset>v140</PlatformToolset> 155 <UseOfMfc>false</UseOfMfc> 156 <CharacterSet>MultiByte</CharacterSet> 157 </PropertyGroup> 94 158 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 95 159 <ConfigurationType>StaticLibrary</ConfigurationType> … … 127 191 <UseOfMfc>false</UseOfMfc> 128 192 <CharacterSet>MultiByte</CharacterSet> 193 </PropertyGroup> 194 <!-- Override the PlatformToolset --> 195 <PropertyGroup> 196 <PlatformToolset>$(BuildToolset)</PlatformToolset> 197 <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 129 198 </PropertyGroup> 130 199 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> … … 133 202 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 134 203 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 135 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 136 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 204 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 205 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 206 </ImportGroup> 207 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 208 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 209 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 210 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 137 211 </ImportGroup> 138 212 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 139 213 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 140 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 141 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 214 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 215 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 216 </ImportGroup> 217 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 218 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 219 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 220 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 142 221 </ImportGroup> 143 222 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 144 223 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 145 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 146 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 224 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 225 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 226 </ImportGroup> 227 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 228 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 229 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 230 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 147 231 </ImportGroup> 148 232 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 149 233 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 150 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 151 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 234 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 235 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 236 </ImportGroup> 237 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 238 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 239 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 240 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 152 241 </ImportGroup> 153 242 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 154 243 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 155 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 156 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 244 <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 245 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 246 </ImportGroup> 247 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 248 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 249 <Import Project="..\..\build\vs\pjproject-vs14-arm-release-defaults.props" /> 250 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 157 251 </ImportGroup> 158 252 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 159 253 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 160 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 161 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 254 <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 255 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 256 </ImportGroup> 257 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 258 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 259 <Import Project="..\..\build\vs\pjproject-vs14-arm-common-defaults.props" /> 260 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 162 261 </ImportGroup> 163 262 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 164 263 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 165 166 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 264 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 265 <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 167 266 </ImportGroup> 168 267 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 169 268 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 170 171 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 269 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 270 <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 172 271 </ImportGroup> 173 272 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 174 273 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 175 176 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 274 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 275 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 177 276 </ImportGroup> 178 277 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 179 278 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 180 181 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 279 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 280 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 182 281 </ImportGroup> 183 282 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 184 283 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 185 186 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 284 <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 285 <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 187 286 </ImportGroup> 188 287 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 189 288 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 190 191 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 289 <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 290 <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 192 291 </ImportGroup> 193 292 <PropertyGroup Label="UserMacros" /> 194 293 <PropertyGroup> 195 294 <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 196 <TargetName>pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 197 </PropertyGroup> 295 <TargetName>pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName> 296 </PropertyGroup> 297 <!-- Compile and link option definition --> 298 <ItemDefinitionGroup> 299 <ClCompile> 300 <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 301 </ClCompile> 302 </ItemDefinitionGroup> 198 303 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 199 304 <ClCompile> … … 201 306 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 202 307 <PrecompiledHeaderOutputFile /> 308 </ClCompile> 309 <Lib> 310 <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 311 </Lib> 312 </ItemDefinitionGroup> 313 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 314 <ClCompile> 315 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 316 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 317 <PrecompiledHeaderOutputFile> 318 </PrecompiledHeaderOutputFile> 203 319 </ClCompile> 204 320 <Lib> … … 230 346 </Lib> 231 347 </ItemDefinitionGroup> 348 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 349 <ClCompile> 350 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 351 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 352 <PrecompiledHeaderOutputFile> 353 </PrecompiledHeaderOutputFile> 354 </ClCompile> 355 <Lib> 356 <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 357 </Lib> 358 </ItemDefinitionGroup> 232 359 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 233 360 <Midl> … … 253 380 </Lib> 254 381 </ItemDefinitionGroup> 382 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 383 <ClCompile> 384 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 385 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 386 <PrecompiledHeaderOutputFile> 387 </PrecompiledHeaderOutputFile> 388 </ClCompile> 389 <Lib> 390 <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 391 </Lib> 392 </ItemDefinitionGroup> 255 393 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'"> 256 394 <Midl> … … 277 415 </Lib> 278 416 </ItemDefinitionGroup> 417 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 418 <ClCompile> 419 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 420 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 421 <PrecompiledHeaderOutputFile> 422 </PrecompiledHeaderOutputFile> 423 </ClCompile> 424 <Lib> 425 <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 426 </Lib> 427 </ItemDefinitionGroup> 279 428 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'"> 280 429 <Midl> … … 300 449 </Lib> 301 450 </ItemDefinitionGroup> 451 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 452 <ClCompile> 453 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 454 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 455 <PrecompiledHeaderOutputFile> 456 </PrecompiledHeaderOutputFile> 457 </ClCompile> 458 <Lib> 459 <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 460 </Lib> 461 </ItemDefinitionGroup> 302 462 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'"> 303 463 <Midl> … … 319 479 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 320 480 <PrecompiledHeaderOutputFile /> 481 </ClCompile> 482 <Lib> 483 <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 484 </Lib> 485 </ItemDefinitionGroup> 486 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 487 <ClCompile> 488 <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 489 <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 490 <PrecompiledHeaderOutputFile> 491 </PrecompiledHeaderOutputFile> 321 492 </ClCompile> 322 493 <Lib> -
pjproject/trunk/pjmedia/include/pjmedia-audiodev/config.h
r5268 r5539 114 114 115 115 116 /**117 * This setting controls whether WMME support should be included.118 */116 /** 117 * This setting controls whether WMME support should be included. 118 */ 119 119 #ifndef PJMEDIA_AUDIO_DEV_HAS_WMME 120 # define PJMEDIA_AUDIO_DEV_HAS_WMME 1 121 #endif 122 123 124 /** 120 # ifdef PJ_WIN32_UWP 121 # define PJMEDIA_AUDIO_DEV_HAS_WMME 0 122 # else 123 # define PJMEDIA_AUDIO_DEV_HAS_WMME 1 124 # endif 125 #endif 126 127 128 /** 129 * This setting controls whether Windows Audio Session API (WASAPI) 130 * support should be included. 131 */ 132 #ifndef PJMEDIA_AUDIO_DEV_HAS_WASAPI 133 # ifdef PJ_WIN32_UWP 134 # define PJMEDIA_AUDIO_DEV_HAS_WASAPI 1 135 # else 136 # define PJMEDIA_AUDIO_DEV_HAS_WASAPI 0 137 # endif 138 #endif 139 140 141 /** 125 142 * This setting controls whether BDIMAD support should be included. 126 143 */ -
pjproject/trunk/pjmedia/include/pjmedia-audiodev/errno.h
r4432 r5539 193 193 #define PJMEDIA_EAUD_BADLATENCY (PJMEDIA_AUDIODEV_ERRNO_START+12) /* 4200012 */ 194 194 195 196 197 195 /** 196 * @hideinitializer 197 * General WASAPI error 198 */ 199 #define PJMEDIA_EAUD_WASAPI_ERROR \ 200 (PJMEDIA_AUDIODEV_ERRNO_START+13) /* 4200013 */ 198 201 199 202 /** -
pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c
r5255 r5539 1 1 /* $Id$ */ 2 /* 2 /* 3 3 * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com) 4 4 * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> … … 16 16 * You should have received a copy of the GNU General Public License 17 17 * along with this program; if not, write to the Free Software 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 19 */ 20 20 #include <pjmedia-audiodev/audiodev_imp.h> … … 67 67 #if PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA 68 68 pjmedia_aud_dev_factory* pjmedia_symb_mda_factory(pj_pool_factory *pf); 69 #endif 70 71 #if PJMEDIA_AUDIO_DEV_HAS_WASAPI 72 pjmedia_aud_dev_factory* pjmedia_wasapi_factory(pj_pool_factory *pf); 69 73 #endif 70 74 … … 89 93 90 94 /* Register error subsystem */ 91 status = pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START, 92 PJ_ERRNO_SPACE_SIZE, 95 status = pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START, 96 PJ_ERRNO_SPACE_SIZE, 93 97 &pjmedia_audiodev_strerror); 94 98 pj_assert(status == PJ_SUCCESS); … … 132 136 #if PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA 133 137 aud_subsys->drv[aud_subsys->drv_cnt++].create = &pjmedia_symb_mda_factory; 138 #endif 139 #if PJMEDIA_AUDIO_DEV_HAS_WASAPI 140 aud_subsys->drv[aud_subsys->drv_cnt++].create = &pjmedia_wasapi_factory; 134 141 #endif 135 142 #if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO -
pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c
r4538 r5539 753 753 754 754 if (udp->attached) { 755 int i; 756 755 757 /* Lock the ioqueue keys to make sure that callbacks are 756 758 * not executed. See ticket #460 for details. … … 772 774 udp->rtcp_cb = NULL; 773 775 udp->user_data = NULL; 776 777 /* Cancel any outstanding send */ 778 for (i=0; i<PJ_ARRAY_SIZE(udp->rtp_pending_write); ++i) { 779 pj_ioqueue_post_completion(udp->rtp_key, 780 &udp->rtp_pending_write[i].op_key, 0); 781 } 782 pj_ioqueue_post_completion(udp->rtcp_key, &udp->rtcp_write_op, 0); 774 783 775 784 /* Unlock keys */ -
pjproject/trunk/pjnath/build/pjnath.vcxproj
r5168 r5539 2 2 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <ItemGroup Label="ProjectConfigurations"> 4 <ProjectConfiguration Include="Debug-Dynamic|ARM"> 5 <Configuration>Debug-Dynamic</Configuration> 6 <Platform>ARM</Platform> 7 </ProjectConfiguration> 4 8 <ProjectConfiguration Include="Debug-Dynamic|Win32"> 5 9 <Configuration>Debug-Dynamic</Configuration> … … 10 14 <Platform>x64</Platform> 11 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Debug-Static|ARM"> 17 <Configuration>Debug-Static</Configuration> 18 <Platform>ARM</Platform> 19 </ProjectConfiguration> 12 20 <ProjectConfiguration Include="Debug-Static|Win32"> 13 21 <Configuration>Debug-Static</Configuration> … … 18 26 <Platform>x64</Platform> 19 27 </ProjectConfiguration> 28 <ProjectConfiguration Include="Debug|ARM"> 29 <Configuration>Debug</Configuration> 30 <Platform>ARM</Platform> 31 </ProjectConfiguration> 20 32 <ProjectConfiguration Include="Debug|Win32"> 21 33 <Configuration>Debug</Configuration> … … 26 38 <Platform>x64</Platform> 27 39 </ProjectConfiguration> 40 <ProjectConfiguration Include="Release-Dynamic|ARM"> 41 <Configuration>Release-Dynamic</Configuration> 42 <Platform>ARM</Platform> 43 </ProjectConfiguration> 28 44 <ProjectConfiguration Include="Release-Dynamic|Win32"> 29 45 <Configuration>Release-Dynamic</Configuration> … … 34 50 <Platform>x64</Platform> 35 51 </ProjectConfiguration> 52 <ProjectConfiguration Include="Release-Static|ARM"> 53 <Configuration>Release-Static</Configuration> 54 <Platform>ARM</Platform> 55 </ProjectConfiguration> 36 56 <ProjectConfiguration Include="Release-Static|Win32"> 37 57 <Configuration>Release-Static</Configuration> … … 42 62 <Platform>x64</Platform> 43 63 </ProjectConfiguration> 64 <ProjectConfiguration Include="Release|ARM"> 65 <Configuration>Release</Configuration> 66 <Platform>ARM</Platform> 67 </ProjectConfiguration> 44 68 <ProjectConfiguration Include="Release|Win32"> 45 69 <Configuration>Release</Configuration> … … 51 75 </ProjectConfiguration> 52 76 </ItemGroup> 77 <!-- Import common config --> 78 <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" /> 53 79 <PropertyGroup Label="Globals"> 54 80 <ProjectGuid>{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}</ProjectGuid> 55 <RootNamespace>pjnath</RootNamespace> 81 <RootNamespace>pjnath</RootNamespace> 82 <!-- Specific UWP property --> 83 <DefaultLanguage>en-US</DefaultLanguage> 56 84 </PropertyGroup> 57 85 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> … … 62 90 <CharacterSet>MultiByte</CharacterSet> 63 91 </PropertyGroup> 92 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 93 <ConfigurationType>StaticLibrary</ConfigurationType> 94 <PlatformToolset>v140</PlatformToolset> 95 <UseOfMfc>false</UseOfMfc> 96 <CharacterSet>MultiByte</CharacterSet> 97 </PropertyGroup> 64 98 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration"> 65 99 <ConfigurationType>StaticLibrary</ConfigurationType> … … 68 102 <CharacterSet>MultiByte</CharacterSet> 69 103 </PropertyGroup> 104 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 105 <ConfigurationType>StaticLibrary</ConfigurationType> 106 <PlatformToolset>v140</PlatformToolset> 107 <UseOfMfc>false</UseOfMfc> 108 <CharacterSet>MultiByte</CharacterSet> 109 </PropertyGroup> 70 110 <PropertyGroup Condition="'$(Configuration)|$(Platf