Changeset 5514


Ignore:
Timestamp:
Dec 28, 2016 5:20:16 AM (3 years ago)
Author:
riza
Message:

Re #1900: Fix merge conflict for solution file and project files. And fix some compile error found for UWP.

Location:
pjproject/branches/projects/uwp
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/uwp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • pjproject/branches/projects/uwp/build/vs/pjproject-vs14-api-def.props

    r5254 r5514  
    1010     * WinPhone8    (Windows Phone 8) 
    1111    --> 
    12     <API_Family>UWP</API_Family> 
     12    <API_Family>WinDesktop</API_Family> 
    1313  </PropertyGroup> 
    1414</Project> 
  • pjproject/branches/projects/uwp/build/vs/pjproject-vs14-common-defaults.props

    r5210 r5514  
    2121      <CompileAsWinRT>false</CompileAsWinRT> 
    2222      <PrecompiledHeader>NotUsing</PrecompiledHeader> 
     23      <SDLCheck>false</SDLCheck> 
    2324    </ClCompile> 
    2425    <Lib> 
    2526      <OutputFile>..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
    26       <AdditionalOptions>/Ignore:4264 %(AdditionalOptions)</AdditionalOptions>       
     27      <AdditionalOptions>/Ignore:4264 %(AdditionalOptions)</AdditionalOptions> 
    2728    </Lib> 
    2829    <Link> 
  • pjproject/branches/projects/uwp/pjmedia/src/pjmedia-audiodev/audiodev.c

    r5513 r5514  
    11/* $Id$ */ 
    2 /*  
     2/* 
    33 * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com) 
    44 * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> 
     
    1616 * You should have received a copy of the GNU General Public License 
    1717 * 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 
    1919 */ 
    2020#include <pjmedia-audiodev/audiodev_imp.h> 
     
    9393 
    9494    /* Register error subsystem */ 
    95     status = pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START,  
    96                                   PJ_ERRNO_SPACE_SIZE,  
     95    status = pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START, 
     96                                  PJ_ERRNO_SPACE_SIZE, 
    9797                                  &pjmedia_audiodev_strerror); 
    9898    pj_assert(status == PJ_SUCCESS); 
     
    138138#endif 
    139139#if PJMEDIA_AUDIO_DEV_HAS_WASAPI 
    140     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_wasapi_factory; 
     140    aud_subsys->drv[aud_subsys->drv_cnt++].create = &pjmedia_wasapi_factory; 
    141141#endif 
    142142#if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO 
  • pjproject/branches/projects/uwp/pjproject-vs14.sln

    r5254 r5514  
    22Microsoft Visual Studio Solution File, Format Version 12.00 
    33# Visual Studio 14 
    4 VisualStudioVersion = 14.0.23107.0 
     4VisualStudioVersion = 14.0.25420.1 
    55MinimumVisualStudioVersion = 10.0.40219.1 
    66Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1DFF1CF3-DBD7-4DA4-A36D-663D695EB678}" 
     
    5353Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbccodec", "third_party\build\ilbc\libilbccodec.vcxproj", "{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}" 
    5454EndProject 
    55 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libportaudio", "third_party\build\portaudio\libportaudio.vcxproj", "{3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}" 
    56 EndProject 
    5755Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "third_party\build\resample\libresample.vcxproj", "{6794B975-4E84-4F49-B2DC-C31F2224E03E}" 
    5856EndProject 
     
    9795Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsua_cli_wp8_comp", "pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_wp8_comp.vcxproj", "{E75EFD41-C7F5-44C8-8FF1-A310D920989D}" 
    9896EndProject 
    99 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pjsua_winrt", "pjsua_winrt", "{54F6163A-66C6-4F09-844D-CC61DE8EE376}" 
    100 EndProject 
    101 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "winrt sample", "winrt sample", "{78DA8BE5-2D77-49D6-8CA4-7847B65DBE84}" 
    102 EndProject 
    103 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "uwp foreground", "uwp foreground", "{452C38CE-6463-4963-A113-658B6BD91D15}" 
     97Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pjsua_winrt_cli", "pjsua_winrt_cli", "{54F6163A-66C6-4F09-844D-CC61DE8EE376}" 
     98EndProject 
     99Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pjsua_winrt_gui", "pjsua_winrt_gui", "{78DA8BE5-2D77-49D6-8CA4-7847B65DBE84}" 
    104100EndProject 
    105101Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wp8", "wp8", "{DE5C2BE2-873A-4B85-8EBE-8AEA4C80212F}" 
     
    113109Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "pjsip-apps\src\pjsua\winrt\gui\wp8\UI\UI.csproj", "{3085ACA0-00DA-45BF-9110-A3684B56EBBA}" 
    114110EndProject 
    115 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "pjsip-apps\src\pjsua\winrt\gui\uwp foreground\UI\UI.csproj", "{D51DC5BE-5822-4B94-891C-E1B1B7892939}" 
    116 EndProject 
    117 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BackEnd", "pjsip-apps\src\pjsua\winrt\gui\uwp foreground\BackEnd\BackEnd.vcxproj", "{9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}" 
    118 EndProject 
    119111Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "uwp", "uwp", "{87D83489-039E-4123-BE01-CB62EE932A29}" 
    120112EndProject 
     
    126118EndProject 
    127119Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoipTasks", "pjsip-apps\src\pjsua\winrt\gui\uwp\VoipTasks\VoipTasks.csproj", "{9FDF5E33-D15D-409F-876E-4E77727936B9}" 
     120EndProject 
     121Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyuv", "third_party\build\yuv\libyuv.vcxproj", "{6AC9B65F-0862-4A5C-8A9D-141516993130}" 
     122EndProject 
     123Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebrtc", "third_party\build\webrtc\libwebrtc.vcxproj", "{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}" 
    128124EndProject 
    129125Global 
    130126        GlobalSection(SharedMSBuildProjectFiles) = preSolution 
    131                 pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{207e7bd4-7b11-4a40-ba3a-cc627762a7b6}*SharedItemsImports = 4 
    132127                pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 
    133128        EndGlobalSection 
     
    771766                {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|x64.ActiveCfg = Release-Static|x64 
    772767                {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|x64.Build.0 = Release-Static|x64 
    773                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Any CPU.ActiveCfg = Debug|Win32 
    774                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|ARM.ActiveCfg = Debug|ARM 
    775                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Win32.ActiveCfg = Debug|Win32 
    776                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Win32.Build.0 = Debug|Win32 
    777                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|x64.ActiveCfg = Debug|x64 
    778                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|x64.Build.0 = Debug|x64 
    779                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32 
    780                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32 
    781                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 
    782                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 
    783                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64 
    784                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64 
    785                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32 
    786                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32 
    787                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 
    788                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 
    789                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|x64.ActiveCfg = Debug-Static|x64 
    790                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|x64.Build.0 = Debug-Static|x64 
    791                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Any CPU.ActiveCfg = Release|Win32 
    792                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|ARM.ActiveCfg = Release|Win32 
    793                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Win32.ActiveCfg = Release|Win32 
    794                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Win32.Build.0 = Release|Win32 
    795                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|x64.ActiveCfg = Release|x64 
    796                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|x64.Build.0 = Release|x64 
    797                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32 
    798                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32 
    799                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 
    800                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 
    801                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64 
    802                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64 
    803                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32 
    804                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|ARM.ActiveCfg = Release-Static|Win32 
    805                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 
    806                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Win32.Build.0 = Release-Static|Win32 
    807                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|x64.ActiveCfg = Release-Static|x64 
    808                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|x64.Build.0 = Release-Static|x64 
    809768                {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Any CPU.ActiveCfg = Debug|Win32 
    810769                {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|ARM.ActiveCfg = Debug|ARM 
     
    18771836                {3085ACA0-00DA-45BF-9110-A3684B56EBBA}.Release-Static|x64.Build.0 = Release|x64 
    18781837                {3085ACA0-00DA-45BF-9110-A3684B56EBBA}.Release-Static|x64.Deploy.0 = Release|x64 
    1879                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|Any CPU.ActiveCfg = Debug|x86 
    1880                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|ARM.ActiveCfg = Debug|ARM 
    1881                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|ARM.Build.0 = Debug|ARM 
    1882                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|ARM.Deploy.0 = Debug|ARM 
    1883                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|Win32.ActiveCfg = Debug|x86 
    1884                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|Win32.Build.0 = Debug|x86 
    1885                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|Win32.Deploy.0 = Debug|x86 
    1886                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|x64.ActiveCfg = Debug|x64 
    1887                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|x64.Build.0 = Debug|x64 
    1888                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug|x64.Deploy.0 = Debug|x64 
    1889                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|Any CPU.ActiveCfg = Release|x86 
    1890                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|Any CPU.Build.0 = Release|x86 
    1891                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|Any CPU.Deploy.0 = Release|x86 
    1892                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM 
    1893                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|ARM.Build.0 = Debug|ARM 
    1894                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|ARM.Deploy.0 = Debug|ARM 
    1895                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|Win32.ActiveCfg = Debug|x86 
    1896                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|Win32.Build.0 = Debug|x86 
    1897                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|Win32.Deploy.0 = Debug|x86 
    1898                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|x64.ActiveCfg = Debug|x64 
    1899                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|x64.Build.0 = Debug|x64 
    1900                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Dynamic|x64.Deploy.0 = Debug|x64 
    1901                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|Any CPU.ActiveCfg = Release|x86 
    1902                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|Any CPU.Build.0 = Release|x86 
    1903                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|Any CPU.Deploy.0 = Release|x86 
    1904                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|ARM.ActiveCfg = Debug|ARM 
    1905                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|ARM.Build.0 = Debug|ARM 
    1906                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|ARM.Deploy.0 = Debug|ARM 
    1907                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|Win32.ActiveCfg = Debug|x86 
    1908                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|Win32.Build.0 = Debug|x86 
    1909                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|Win32.Deploy.0 = Debug|x86 
    1910                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|x64.ActiveCfg = Debug|x64 
    1911                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|x64.Build.0 = Debug|x64 
    1912                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Debug-Static|x64.Deploy.0 = Debug|x64 
    1913                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|Any CPU.ActiveCfg = Release|x86 
    1914                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|ARM.ActiveCfg = Release|ARM 
    1915                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|ARM.Build.0 = Release|ARM 
    1916                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|ARM.Deploy.0 = Release|ARM 
    1917                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|Win32.ActiveCfg = Release|x86 
    1918                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|Win32.Build.0 = Release|x86 
    1919                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|Win32.Deploy.0 = Release|x86 
    1920                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|x64.ActiveCfg = Release|x64 
    1921                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|x64.Build.0 = Release|x64 
    1922                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release|x64.Deploy.0 = Release|x64 
    1923                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|Any CPU.ActiveCfg = Release|x86 
    1924                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|Any CPU.Build.0 = Release|x86 
    1925                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|Any CPU.Deploy.0 = Release|x86 
    1926                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|ARM.ActiveCfg = Release|ARM 
    1927                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|ARM.Build.0 = Release|ARM 
    1928                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|ARM.Deploy.0 = Release|ARM 
    1929                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|Win32.ActiveCfg = Release|x86 
    1930                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|Win32.Build.0 = Release|x86 
    1931                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|Win32.Deploy.0 = Release|x86 
    1932                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|x64.ActiveCfg = Release|x64 
    1933                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|x64.Build.0 = Release|x64 
    1934                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Dynamic|x64.Deploy.0 = Release|x64 
    1935                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|Any CPU.ActiveCfg = Release|x86 
    1936                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|Any CPU.Build.0 = Release|x86 
    1937                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|Any CPU.Deploy.0 = Release|x86 
    1938                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|ARM.ActiveCfg = Release|ARM 
    1939                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|ARM.Build.0 = Release|ARM 
    1940                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|ARM.Deploy.0 = Release|ARM 
    1941                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|Win32.ActiveCfg = Release|x86 
    1942                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|Win32.Build.0 = Release|x86 
    1943                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|Win32.Deploy.0 = Release|x86 
    1944                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|x64.ActiveCfg = Release|x64 
    1945                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|x64.Build.0 = Release|x64 
    1946                 {D51DC5BE-5822-4B94-891C-E1B1B7892939}.Release-Static|x64.Deploy.0 = Release|x64 
    1947                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug|Any CPU.ActiveCfg = Debug|Win32 
    1948                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug|ARM.ActiveCfg = Debug|ARM 
    1949                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug|ARM.Build.0 = Debug|ARM 
    1950                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug|Win32.ActiveCfg = Debug|Win32 
    1951                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug|Win32.Build.0 = Debug|Win32 
    1952                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug|x64.ActiveCfg = Debug|x64 
    1953                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug|x64.Build.0 = Debug|x64 
    1954                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Dynamic|Any CPU.ActiveCfg = Release|x64 
    1955                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Dynamic|Any CPU.Build.0 = Release|x64 
    1956                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM 
    1957                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Dynamic|ARM.Build.0 = Debug|ARM 
    1958                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32 
    1959                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Dynamic|Win32.Build.0 = Debug|Win32 
    1960                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Dynamic|x64.ActiveCfg = Debug|x64 
    1961                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Dynamic|x64.Build.0 = Debug|x64 
    1962                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Static|Any CPU.ActiveCfg = Release|x64 
    1963                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Static|Any CPU.Build.0 = Release|x64 
    1964                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Static|ARM.ActiveCfg = Debug|ARM 
    1965                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Static|ARM.Build.0 = Debug|ARM 
    1966                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Static|Win32.ActiveCfg = Debug|Win32 
    1967                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Static|Win32.Build.0 = Debug|Win32 
    1968                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Static|x64.ActiveCfg = Debug|x64 
    1969                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Debug-Static|x64.Build.0 = Debug|x64 
    1970                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release|Any CPU.ActiveCfg = Release|Win32 
    1971                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release|ARM.ActiveCfg = Release|ARM 
    1972                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release|ARM.Build.0 = Release|ARM 
    1973                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release|Win32.ActiveCfg = Release|Win32 
    1974                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release|Win32.Build.0 = Release|Win32 
    1975                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release|x64.ActiveCfg = Release|x64 
    1976                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release|x64.Build.0 = Release|x64 
    1977                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Dynamic|Any CPU.ActiveCfg = Release|x64 
    1978                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Dynamic|Any CPU.Build.0 = Release|x64 
    1979                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Dynamic|ARM.ActiveCfg = Release|ARM 
    1980                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Dynamic|ARM.Build.0 = Release|ARM 
    1981                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Dynamic|Win32.ActiveCfg = Release|Win32 
    1982                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Dynamic|Win32.Build.0 = Release|Win32 
    1983                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Dynamic|x64.ActiveCfg = Release|x64 
    1984                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Dynamic|x64.Build.0 = Release|x64 
    1985                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Static|Any CPU.ActiveCfg = Release|x64 
    1986                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Static|Any CPU.Build.0 = Release|x64 
    1987                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Static|ARM.ActiveCfg = Release|ARM 
    1988                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Static|ARM.Build.0 = Release|ARM 
    1989                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Static|Win32.ActiveCfg = Release|Win32 
    1990                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Static|Win32.Build.0 = Release|Win32 
    1991                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Static|x64.ActiveCfg = Release|x64 
    1992                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A}.Release-Static|x64.Build.0 = Release|x64 
    19931838                {B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug|Any CPU.ActiveCfg = Debug|x86 
    19941839                {B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug|ARM.ActiveCfg = Debug|ARM 
     
    22192064                {9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|x64.ActiveCfg = Release|x64 
    22202065                {9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|x64.Build.0 = Release|x64 
     2066                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Any CPU.ActiveCfg = Debug|Win32 
     2067                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM.ActiveCfg = Debug|Win32 
     2068                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.ActiveCfg = Debug|Win32 
     2069                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.Build.0 = Debug|Win32 
     2070                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|x64.ActiveCfg = Debug|x64 
     2071                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|x64.Build.0 = Debug|x64 
     2072                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32 
     2073                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32 
     2074                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 
     2075                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 
     2076                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64 
     2077                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64 
     2078                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32 
     2079                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32 
     2080                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 
     2081                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 
     2082                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|x64.ActiveCfg = Debug-Static|x64 
     2083                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|x64.Build.0 = Debug-Static|x64 
     2084                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Any CPU.ActiveCfg = Release|Win32 
     2085                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM.ActiveCfg = Release|Win32 
     2086                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.ActiveCfg = Release|Win32 
     2087                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.Build.0 = Release|Win32 
     2088                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|x64.ActiveCfg = Release|x64 
     2089                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|x64.Build.0 = Release|x64 
     2090                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32 
     2091                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32 
     2092                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 
     2093                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 
     2094                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64 
     2095                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64 
     2096                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32 
     2097                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM.ActiveCfg = Release-Static|Win32 
     2098                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 
     2099                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.Build.0 = Release-Static|Win32 
     2100                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x64.ActiveCfg = Release-Static|x64 
     2101                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x64.Build.0 = Release-Static|x64 
     2102                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Any CPU.ActiveCfg = Debug|Win32 
     2103                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM.ActiveCfg = Debug|Win32 
     2104                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Win32.ActiveCfg = Debug|Win32 
     2105                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Win32.Build.0 = Debug|Win32 
     2106                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|x64.ActiveCfg = Debug|x64 
     2107                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|x64.Build.0 = Debug|x64 
     2108                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32 
     2109                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32 
     2110                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 
     2111                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 
     2112                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64 
     2113                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64 
     2114                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32 
     2115                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32 
     2116                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 
     2117                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 
     2118                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|x64.ActiveCfg = Debug-Static|x64 
     2119                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|x64.Build.0 = Debug-Static|x64 
     2120                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Any CPU.ActiveCfg = Release|Win32 
     2121                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM.ActiveCfg = Release|Win32 
     2122                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Win32.ActiveCfg = Release|Win32 
     2123                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Win32.Build.0 = Release|Win32 
     2124                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|x64.ActiveCfg = Release|x64 
     2125                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|x64.Build.0 = Release|x64 
     2126                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32 
     2127                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32 
     2128                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 
     2129                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 
     2130                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64 
     2131                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64 
     2132                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32 
     2133                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM.ActiveCfg = Release-Static|Win32 
     2134                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 
     2135                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Win32.Build.0 = Release-Static|Win32 
     2136                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|x64.ActiveCfg = Release-Static|x64 
     2137                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|x64.Build.0 = Release-Static|x64 
    22212138        EndGlobalSection 
    22222139        GlobalSection(SolutionProperties) = preSolution 
     
    22292146                {207E7BD4-7B11-4A40-BA3A-CC627762A7B6} = {54F6163A-66C6-4F09-844D-CC61DE8EE376} 
    22302147                {E75EFD41-C7F5-44C8-8FF1-A310D920989D} = {54F6163A-66C6-4F09-844D-CC61DE8EE376} 
    2231                 {452C38CE-6463-4963-A113-658B6BD91D15} = {78DA8BE5-2D77-49D6-8CA4-7847B65DBE84} 
    22322148                {DE5C2BE2-873A-4B85-8EBE-8AEA4C80212F} = {78DA8BE5-2D77-49D6-8CA4-7847B65DBE84} 
    22332149                {820034C1-645D-4340-8813-D980C1EF77DE} = {DE5C2BE2-873A-4B85-8EBE-8AEA4C80212F} 
     
    22352151                {BBABEEA1-494C-4618-96E3-399873A5558B} = {DE5C2BE2-873A-4B85-8EBE-8AEA4C80212F} 
    22362152                {3085ACA0-00DA-45BF-9110-A3684B56EBBA} = {DE5C2BE2-873A-4B85-8EBE-8AEA4C80212F} 
    2237                 {D51DC5BE-5822-4B94-891C-E1B1B7892939} = {452C38CE-6463-4963-A113-658B6BD91D15} 
    2238                 {9C5609A2-32A2-483F-81EC-DAC2ED96BF6A} = {452C38CE-6463-4963-A113-658B6BD91D15} 
    22392153                {87D83489-039E-4123-BE01-CB62EE932A29} = {78DA8BE5-2D77-49D6-8CA4-7847B65DBE84} 
    22402154                {B11B5672-B1E8-4C77-BDA1-4E6620F96BF9} = {87D83489-039E-4123-BE01-CB62EE932A29} 
  • pjproject/branches/projects/uwp/pjsip-apps/build/libpjproject.vcxproj

    r5497 r5514  
    624624      <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 
    625625    </ProjectReference> 
    626     <ProjectReference Condition="'$(API_Family)'=='WinDesktop'" Include="..\..\third_party\build\portaudio\libportaudio.vcxproj"> 
    627       <Project>{3cf9ffa9-8387-4635-9d1b-e7944cbefeaa}</Project> 
    628       <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 
    629     </ProjectReference> 
    630626    <ProjectReference Include="..\..\third_party\build\resample\libresample.vcxproj"> 
    631627      <Project>{6794b975-4e84-4f49-b2dc-c31f2224e03e}</Project> 
     
    639635      <Project>{f0dbaa03-1ba3-4e3b-a2ca-727e3d3ab858}</Project> 
    640636      <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 
     637    </ProjectReference> 
     638    <ProjectReference Include="..\..\third_party\build\webrtc\libwebrtc.vcxproj"> 
     639      <Project>{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}</Project> 
     640    </ProjectReference> 
     641    <ProjectReference Include="..\..\third_party\build\yuv\libyuv.vcxproj"> 
     642      <Project>{6ac9b65f-0862-4a5c-8a9d-141516993130}</Project> 
    641643    </ProjectReference> 
    642644  </ItemGroup> 
  • pjproject/branches/projects/uwp/third_party/build/srtp/libsrtp.vcxproj

    r5497 r5514  
    178178  <PropertyGroup> 
    179179    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
    180     <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 
     180    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"> 
     181    </CharacterSet> 
    181182  </PropertyGroup> 
    182183  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
     
    276277  <PropertyGroup> 
    277278    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    278     <OutDir>..\..\lib\</OutDir>     
     279    <OutDir>..\..\lib\</OutDir> 
    279280  </PropertyGroup> 
    280281  <!-- Compile and link option definition --> 
     
    287288    <ClCompile> 
    288289      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    289       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     290      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    290291      <PrecompiledHeaderOutputFile /> 
    291292    </ClCompile> 
     
    311312    <ClCompile> 
    312313      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    313       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     314      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    314315      <PrecompiledHeaderOutputFile /> 
    315316      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
     
    322323    <ClCompile> 
    323324      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    324       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     325      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    325326      <PrecompiledHeaderOutputFile /> 
    326327    </ClCompile> 
     
    346347    <ClCompile> 
    347348      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    348       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     349      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    349350      <PrecompiledHeaderOutputFile /> 
    350351    </ClCompile> 
     
    356357    <ClCompile> 
    357358      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    358       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     359      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    359360      <PrecompiledHeaderOutputFile /> 
    360361    </ClCompile> 
     
    380381    <ClCompile> 
    381382      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    382       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     383      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    383384      <PrecompiledHeaderOutputFile /> 
    384385      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
     
    391392    <ClCompile> 
    392393      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    393       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     394      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    394395      <PrecompiledHeaderOutputFile /> 
    395396    </ClCompile> 
     
    415416    <ClCompile> 
    416417      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    417       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     418      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    418419      <PrecompiledHeaderOutputFile /> 
    419420    </ClCompile> 
     
    425426    <ClCompile> 
    426427      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    427       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     428      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    428429      <PrecompiledHeaderOutputFile /> 
    429430    </ClCompile> 
     
    449450    <ClCompile> 
    450451      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    451       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     452      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    452453      <PrecompiledHeaderOutputFile /> 
    453454      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 
     
    460461    <ClCompile> 
    461462      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    462       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     463      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    463464      <PrecompiledHeaderOutputFile /> 
    464465    </ClCompile> 
     
    484485    <ClCompile> 
    485486      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    486       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     487      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    487488      <PrecompiledHeaderOutputFile /> 
    488489    </ClCompile> 
     
    492493  </ItemDefinitionGroup> 
    493494  <ItemGroup> 
    494     <ClCompile Include="..\..\srtp\crypto\ae_xfm\xfm.c" /> 
    495495    <ClCompile Include="..\..\srtp\crypto\cipher\aes.c" /> 
    496496    <ClCompile Include="..\..\srtp\crypto\cipher\aes_cbc.c" /> 
     497    <ClCompile Include="..\..\srtp\crypto\cipher\aes_gcm_ossl.c"> 
     498      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     499      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     500      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     501      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     502      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     503      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     504      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     505      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     506      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     507      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     508      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     509      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     510    </ClCompile> 
    497511    <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm.c" /> 
     512    <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm_ossl.c"> 
     513      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     514      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     515      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     516      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     517      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     518      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     519      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     520      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     521      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     522      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     523      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     524      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     525    </ClCompile> 
    498526    <ClCompile Include="..\..\srtp\crypto\cipher\cipher.c" /> 
    499527    <ClCompile Include="..\..\srtp\crypto\cipher\null_cipher.c" /> 
    500528    <ClCompile Include="..\..\srtp\crypto\hash\auth.c" /> 
    501529    <ClCompile Include="..\..\srtp\crypto\hash\hmac.c" /> 
     530    <ClCompile Include="..\..\srtp\crypto\hash\hmac_ossl.c"> 
     531      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     532      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     533      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     534      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     535      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     536      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     537      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     538      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     539      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     540      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     541      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     542      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     543    </ClCompile> 
    502544    <ClCompile Include="..\..\srtp\crypto\hash\null_auth.c" /> 
    503545    <ClCompile Include="..\..\srtp\crypto\hash\sha1.c" /> 
    504546    <ClCompile Include="..\..\srtp\crypto\kernel\alloc.c" /> 
    505     <ClCompile Include="..\..\srtp\crypto\kernel\crypto_kernel.c" /> 
     547    <ClCompile Include="..\..\srtp\crypto\kernel\crypto_kernel.c"> 
     548      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
     549      </DisableSpecificWarnings> 
     550    </ClCompile> 
    506551    <ClCompile Include="..\..\srtp\crypto\kernel\key.c" /> 
    507552    <ClCompile Include="..\..\srtp\crypto\math\datatypes.c" /> 
     
    513558    <ClCompile Include="..\..\srtp\crypto\rng\prng.c" /> 
    514559    <ClCompile Include="..\..\srtp\crypto\rng\rand_source.c" /> 
     560    <ClCompile Include="..\..\srtp\crypto\rng\rand_source_ossl.c"> 
     561      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild> 
     562      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 
     563      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild> 
     564      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 
     565      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild> 
     566      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild> 
     567      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild> 
     568      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 
     569      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild> 
     570      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 
     571      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
     572      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     573    </ClCompile> 
    515574    <ClCompile Include="..\..\srtp\pjlib\srtp_err.c" /> 
    516575    <ClCompile Include="..\..\srtp\srtp\srtp.c" /> 
     576    <ClCompile Include="..\..\srtp\srtp\ekt.c" /> 
    517577  </ItemGroup> 
    518578  <ItemGroup> 
     
    543603    <ClInclude Include="..\..\srtp\crypto\include\sha1.h" /> 
    544604    <ClInclude Include="..\..\srtp\crypto\include\stat.h" /> 
    545     <ClInclude Include="..\..\srtp\crypto\include\xfm.h" /> 
     605    <ClInclude Include="..\..\srtp\include\ekt.h" /> 
    546606    <ClInclude Include="..\..\srtp\include\rtp.h" /> 
    547607    <ClInclude Include="..\..\srtp\include\srtp.h" /> 
  • pjproject/branches/projects/uwp/third_party/build/webrtc/libwebrtc.vcxproj

    r5432 r5514  
    140140    <ClCompile Include="..\..\webrtc\src\webrtc\system_wrappers\source\cpu_features.cc" /> 
    141141  </ItemGroup> 
     142  <!-- Import common config --> 
     143  <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" /> 
    142144  <PropertyGroup Label="Globals"> 
    143145    <ProjectGuid>{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}</ProjectGuid> 
    144146    <RootNamespace>libwebrtc</RootNamespace> 
     147    <!-- Specific UWP property --> 
     148    <DefaultLanguage>en-US</DefaultLanguage> 
    145149  </PropertyGroup> 
    146150  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
     
    216220    <UseOfMfc>false</UseOfMfc> 
    217221    <CharacterSet>MultiByte</CharacterSet> 
     222  </PropertyGroup> 
     223  <!-- Override the PlatformToolset --> 
     224  <PropertyGroup> 
     225    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
     226    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet> 
    218227  </PropertyGroup> 
    219228  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
     
    285294    <OutDir>..\..\lib\</OutDir> 
    286295  </PropertyGroup> 
     296  <!-- Compile and link option definition --> 
     297  <ItemDefinitionGroup> 
     298    <ClCompile> 
     299        <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     300    </ClCompile> 
     301  </ItemDefinitionGroup> 
    287302  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    288303    <ClCompile> 
  • pjproject/branches/projects/uwp/third_party/build/yuv/libyuv.vcxproj

    r5358 r5514  
    5151    </ProjectConfiguration> 
    5252  </ItemGroup> 
     53  <!-- Import common config --> 
     54  <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" /> 
    5355  <PropertyGroup Label="Globals"> 
    5456    <ProjectGuid>{6AC9B65F-0862-4A5C-8A9D-141516993130}</ProjectGuid> 
    5557    <RootNamespace>libyuv</RootNamespace> 
     58    <!-- Specific UWP property --> 
     59    <DefaultLanguage>en-US</DefaultLanguage> 
    5660  </PropertyGroup> 
    5761  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
     
    127131    <UseOfMfc>false</UseOfMfc> 
    128132    <CharacterSet>MultiByte</CharacterSet> 
     133  </PropertyGroup> 
     134  <!-- Override the PlatformToolset --> 
     135  <PropertyGroup> 
     136    <PlatformToolset>$(BuildToolset)</PlatformToolset> 
     137    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"> 
     138    </CharacterSet> 
    129139  </PropertyGroup> 
    130140  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
     
    196206    <OutDir>..\..\lib\</OutDir> 
    197207  </PropertyGroup> 
     208  <!-- Compile and link option definition --> 
     209  <ItemDefinitionGroup> 
     210    <ClCompile> 
     211      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary> 
     212    </ClCompile> 
     213  </ItemDefinitionGroup> 
    198214  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    199215    <ClCompile> 
     
    202218      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    203219      <PrecompiledHeaderOutputFile /> 
     220      <SDLCheck>false</SDLCheck> 
    204221    </ClCompile> 
    205222    <Lib> 
  • pjproject/branches/projects/uwp/third_party/build/yuv/libyuv.vcxproj.filters

    r5358 r5514  
    1212  </ItemGroup> 
    1313  <ItemGroup> 
    14     <ClCompile Include="..\..\libyuv\source\compare.cc"> 
     14    <ClCompile Include="..\..\yuv\source\compare.cc"> 
    1515      <Filter>Source Files</Filter> 
    1616    </ClCompile> 
    17     <ClCompile Include="..\..\libyuv\source\compare_common.cc"> 
     17    <ClCompile Include="..\..\yuv\source\compare_common.cc"> 
    1818      <Filter>Source Files</Filter> 
    1919    </ClCompile> 
    20     <ClCompile Include="..\..\libyuv\source\compare_win.cc"> 
     20    <ClCompile Include="..\..\yuv\source\compare_win.cc"> 
    2121      <Filter>Source Files</Filter> 
    2222    </ClCompile> 
    23     <ClCompile Include="..\..\libyuv\source\convert.cc"> 
     23    <ClCompile Include="..\..\yuv\source\convert.cc"> 
    2424      <Filter>Source Files</Filter> 
    2525    </ClCompile> 
    26     <ClCompile Include="..\..\libyuv\source\convert_argb.cc"> 
     26    <ClCompile Include="..\..\yuv\source\convert_argb.cc"> 
    2727      <Filter>Source Files</Filter> 
    2828    </ClCompile> 
    29     <ClCompile Include="..\..\libyuv\source\convert_from.cc"> 
     29    <ClCompile Include="..\..\yuv\source\convert_from.cc"> 
    3030      <Filter>Source Files</Filter> 
    3131    </ClCompile> 
    32     <ClCompile Include="..\..\libyuv\source\convert_from_argb.cc"> 
     32    <ClCompile Include="..\..\yuv\source\convert_from_argb.cc"> 
    3333      <Filter>Source Files</Filter> 
    3434    </ClCompile> 
    35     <ClCompile Include="..\..\libyuv\source\convert_jpeg.cc"> 
     35    <ClCompile Include="..\..\yuv\source\convert_jpeg.cc"> 
    3636      <Filter>Source Files</Filter> 
    3737    </ClCompile> 
    38     <ClCompile Include="..\..\libyuv\source\convert_to_argb.cc"> 
     38    <ClCompile Include="..\..\yuv\source\convert_to_argb.cc"> 
    3939      <Filter>Source Files</Filter> 
    4040    </ClCompile> 
    41     <ClCompile Include="..\..\libyuv\source\convert_to_i420.cc"> 
     41    <ClCompile Include="..\..\yuv\source\convert_to_i420.cc"> 
    4242      <Filter>Source Files</Filter> 
    4343    </ClCompile> 
    44     <ClCompile Include="..\..\libyuv\source\cpu_id.cc"> 
     44    <ClCompile Include="..\..\yuv\source\cpu_id.cc"> 
    4545      <Filter>Source Files</Filter> 
    4646    </ClCompile> 
    47     <ClCompile Include="..\..\libyuv\source\mjpeg_decoder.cc"> 
     47    <ClCompile Include="..\..\yuv\source\mjpeg_decoder.cc"> 
    4848      <Filter>Source Files</Filter> 
    4949    </ClCompile> 
    50     <ClCompile Include="..\..\libyuv\source\mjpeg_validate.cc"> 
     50    <ClCompile Include="..\..\yuv\source\mjpeg_validate.cc"> 
    5151      <Filter>Source Files</Filter> 
    5252    </ClCompile> 
    53     <ClCompile Include="..\..\libyuv\source\planar_functions.cc"> 
     53    <ClCompile Include="..\..\yuv\source\planar_functions.cc"> 
    5454      <Filter>Source Files</Filter> 
    5555    </ClCompile> 
    56     <ClCompile Include="..\..\libyuv\source\rotate.cc"> 
     56    <ClCompile Include="..\..\yuv\source\rotate.cc"> 
    5757      <Filter>Source Files</Filter> 
    5858    </ClCompile> 
    59     <ClCompile Include="..\..\libyuv\source\rotate_any.cc"> 
     59    <ClCompile Include="..\..\yuv\source\rotate_any.cc"> 
    6060      <Filter>Source Files</Filter> 
    6161    </ClCompile> 
    62     <ClCompile Include="..\..\libyuv\source\rotate_argb.cc"> 
     62    <ClCompile Include="..\..\yuv\source\rotate_argb.cc"> 
    6363      <Filter>Source Files</Filter> 
    6464    </ClCompile> 
    65     <ClCompile Include="..\..\libyuv\source\rotate_common.cc"> 
     65    <ClCompile Include="..\..\yuv\source\rotate_common.cc"> 
    6666      <Filter>Source Files</Filter> 
    6767    </ClCompile> 
    68     <ClCompile Include="..\..\libyuv\source\rotate_win.cc"> 
     68    <ClCompile Include="..\..\yuv\source\rotate_win.cc"> 
    6969      <Filter>Source Files</Filter> 
    7070    </ClCompile> 
    71     <ClCompile Include="..\..\libyuv\source\row_any.cc"> 
     71    <ClCompile Include="..\..\yuv\source\row_any.cc"> 
    7272      <Filter>Source Files</Filter> 
    7373    </ClCompile> 
    74     <ClCompile Include="..\..\libyuv\source\row_common.cc"> 
     74    <ClCompile Include="..\..\yuv\source\row_common.cc"> 
    7575      <Filter>Source Files</Filter> 
    7676    </ClCompile> 
    77     <ClCompile Include="..\..\libyuv\source\row_win.cc"> 
     77    <ClCompile Include="..\..\yuv\source\row_win.cc"> 
    7878      <Filter>Source Files</Filter> 
    7979    </ClCompile> 
    80     <ClCompile Include="..\..\libyuv\source\scale.cc"> 
     80    <ClCompile Include="..\..\yuv\source\scale.cc"> 
    8181      <Filter>Source Files</Filter> 
    8282    </ClCompile> 
    83     <ClCompile Include="..\..\libyuv\source\scale_any.cc"> 
     83    <ClCompile Include="..\..\yuv\source\scale_any.cc"> 
    8484      <Filter>Source Files</Filter> 
    8585    </ClCompile> 
    86     <ClCompile Include="..\..\libyuv\source\scale_argb.cc"> 
     86    <ClCompile Include="..\..\yuv\source\scale_argb.cc"> 
    8787      <Filter>Source Files</Filter> 
    8888    </ClCompile> 
    89     <ClCompile Include="..\..\libyuv\source\scale_common.cc"> 
     89    <ClCompile Include="..\..\yuv\source\scale_common.cc"> 
    9090      <Filter>Source Files</Filter> 
    9191    </ClCompile> 
    92     <ClCompile Include="..\..\libyuv\source\scale_win.cc"> 
     92    <ClCompile Include="..\..\yuv\source\scale_win.cc"> 
    9393      <Filter>Source Files</Filter> 
    9494    </ClCompile> 
    95     <ClCompile Include="..\..\libyuv\source\video_common.cc"> 
     95    <ClCompile Include="..\..\yuv\source\video_common.cc"> 
    9696      <Filter>Source Files</Filter> 
    9797    </ClCompile> 
    9898  </ItemGroup> 
    9999  <ItemGroup> 
    100     <ClInclude Include="..\..\libyuv\include\libyuv.h"> 
     100    <ClInclude Include="..\..\yuv\include\libyuv.h"> 
    101101      <Filter>Header Files</Filter> 
    102102    </ClInclude> 
  • pjproject/branches/projects/uwp/third_party/yuv/source/cpu_id.cc

    r5358 r5514  
    168168// Test environment variable for disabling CPU features. Any non-zero value 
    169169// to disable. Zero ignored to make it easy to set the variable on/off. 
    170 #if !defined(__native_client__) && !defined(_M_ARM) 
     170#if !defined(__native_client__) && !defined(_M_ARM) && !defined(_MSC_VER) 
    171171 
    172172static LIBYUV_BOOL TestEnv(const char* name) { 
Note: See TracChangeset for help on using the changeset viewer.