Ignore:
Timestamp:
Dec 28, 2016 5:20:16 AM (8 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:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/branches/projects/uwp

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • 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} 
Note: See TracChangeset for help on using the changeset viewer.