Changeset 5547


Ignore:
Timestamp:
Jan 25, 2017 7:52:32 AM (8 years ago)
Author:
riza
Message:

Re #1900: Fixed some build error for UWP arm.

Location:
pjproject/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/pjmedia/build/pjmedia.vcxproj

    r5539 r5547  
    314314  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
    315315    <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> 
     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;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     317      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    318318      <PrecompiledHeaderOutputFile> 
    319319      </PrecompiledHeaderOutputFile> 
    … …  
    339339  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
    340340    <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> 
     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;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     342      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    343343      <PrecompiledHeaderOutputFile> 
    344344      </PrecompiledHeaderOutputFile> 
    … …  
    365365  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
    366366    <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> 
     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;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     368      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    369369      <PrecompiledHeaderOutputFile> 
    370370      </PrecompiledHeaderOutputFile> 
    … …  
    391391  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
    392392    <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> 
     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;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     394      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    395395      <PrecompiledHeaderOutputFile> 
    396396      </PrecompiledHeaderOutputFile> 
    … …  
    416416  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
    417417    <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> 
     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;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     419      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    420420      <PrecompiledHeaderOutputFile> 
    421421      </PrecompiledHeaderOutputFile> 
    … …  
    442442  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
    443443    <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> 
     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;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     445      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    446446      <PrecompiledHeaderOutputFile> 
    447447      </PrecompiledHeaderOutputFile> 

  • pjproject/trunk/pjproject-vs14.sln

    r5539 r5547  
    18491849                {9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|x64.Build.0 = Release|x64 
    18501850                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Any CPU.ActiveCfg = Debug|Win32 
    1851                 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM.ActiveCfg = Debug|Win32 
     1851                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM.ActiveCfg = Debug|ARM 
     1852                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM.Build.0 = Debug|ARM 
    18521853                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.ActiveCfg = Debug|Win32 
    18531854                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.Build.0 = Debug|Win32 
    … …  
    18551856                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|x64.Build.0 = Debug|x64 
    18561857                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32 
    1857                 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32 
     1858                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM 
     1859                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM 
    18581860                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 
    18591861                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 
    … …  
    18611863                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64 
    18621864                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32 
    1863                 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32 
     1865                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM 
     1866                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM.Build.0 = Debug-Static|ARM 
    18641867                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 
    18651868                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 
    … …  
    18671870                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|x64.Build.0 = Debug-Static|x64 
    18681871                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Any CPU.ActiveCfg = Release|Win32 
    1869                 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM.ActiveCfg = Release|Win32 
     1872                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM.ActiveCfg = Release|ARM 
     1873                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM.Build.0 = Release|ARM 
    18701874                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.ActiveCfg = Release|Win32 
    18711875                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.Build.0 = Release|Win32 
    … …  
    18731877                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|x64.Build.0 = Release|x64 
    18741878                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32 
    1875                 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32 
     1879                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM 
     1880                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM 
    18761881                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 
    18771882                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 
    … …  
    18791884                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64 
    18801885                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32 
    1881                 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM.ActiveCfg = Release-Static|Win32 
     1886                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM.ActiveCfg = Release-Static|ARM 
     1887                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM.Build.0 = Release-Static|ARM 
    18821888                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 
    18831889                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.Build.0 = Release-Static|Win32 
    … …  
    18851891                {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x64.Build.0 = Release-Static|x64 
    18861892                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Any CPU.ActiveCfg = Debug|Win32 
    1887                 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM.ActiveCfg = Debug|Win32 
     1893                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM.ActiveCfg = Debug|ARM 
     1894                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM.Build.0 = Debug|ARM 
    18881895                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Win32.ActiveCfg = Debug|Win32 
    18891896                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Win32.Build.0 = Debug|Win32 
    … …  
    18911898                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|x64.Build.0 = Debug|x64 
    18921899                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32 
    1893                 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32 
     1900                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM 
     1901                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM 
    18941902                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 
    18951903                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 
    … …  
    18971905                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64 
    18981906                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32 
    1899                 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32 
     1907                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM 
     1908                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM.Build.0 = Debug-Static|ARM 
    19001909                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 
    19011910                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 
    … …  
    19031912                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|x64.Build.0 = Debug-Static|x64 
    19041913                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Any CPU.ActiveCfg = Release|Win32 
    1905                 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM.ActiveCfg = Release|Win32 
     1914                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM.ActiveCfg = Release|ARM 
     1915                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM.Build.0 = Release|ARM 
    19061916                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Win32.ActiveCfg = Release|Win32 
    19071917                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Win32.Build.0 = Release|Win32 
    … …  
    19091919                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|x64.Build.0 = Release|x64 
    19101920                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32 
    1911                 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32 
     1921                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM 
     1922                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM 
    19121923                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 
    19131924                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 
    … …  
    19151926                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64 
    19161927                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32 
    1917                 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM.ActiveCfg = Release-Static|Win32 
     1928                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM.ActiveCfg = Release-Static|ARM 
     1929                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM.Build.0 = Release-Static|ARM 
    19181930                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 
    19191931                {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Win32.Build.0 = Release-Static|Win32 

  • pjproject/trunk/third_party/build/srtp/libsrtp.vcxproj

    r5539 r5547  
    298298    <ClCompile> 
    299299      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    300       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     300      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    301301      <PrecompiledHeaderOutputFile> 
    302302      </PrecompiledHeaderOutputFile> 
    … …  
    333333    <ClCompile> 
    334334      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    335       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     335      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    336336      <PrecompiledHeaderOutputFile> 
    337337      </PrecompiledHeaderOutputFile> 
    … …  
    367367    <ClCompile> 
    368368      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    369       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     369      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    370370      <PrecompiledHeaderOutputFile> 
    371371      </PrecompiledHeaderOutputFile> 
    … …  
    402402    <ClCompile> 
    403403      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    404       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     404      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    405405      <PrecompiledHeaderOutputFile> 
    406406      </PrecompiledHeaderOutputFile> 
    … …  
    436436    <ClCompile> 
    437437      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    438       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     438      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    439439      <PrecompiledHeaderOutputFile> 
    440440      </PrecompiledHeaderOutputFile> 
    … …  
    471471    <ClCompile> 
    472472      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    473       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     473      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    474474      <PrecompiledHeaderOutputFile> 
    475475      </PrecompiledHeaderOutputFile> 
    … …  
    508508      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
    509509      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     510      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 
     511      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 
     512      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 
     513      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 
     514      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 
     515      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 
    510516    </ClCompile> 
    511517    <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm.c" /> 
    … …  
    523529      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
    524530      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     531      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 
     532      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 
     533      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 
     534      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 
     535      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 
     536      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 
    525537    </ClCompile> 
    526538    <ClCompile Include="..\..\srtp\crypto\cipher\cipher.c" /> 
    … …  
    541553      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
    542554      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     555      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 
     556      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 
     557      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 
     558      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 
     559      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 
     560      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 
    543561    </ClCompile> 
    544562    <ClCompile Include="..\..\srtp\crypto\hash\null_auth.c" /> 
    … …  
    571589      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> 
    572590      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> 
     591      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> 
     592      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> 
     593      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> 
     594      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> 
     595      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> 
     596      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> 
    573597    </ClCompile> 
    574598    <ClCompile Include="..\..\srtp\pjlib\srtp_err.c" /> 

  • pjproject/trunk/third_party/build/webrtc/libwebrtc.vcxproj

    r5539 r5547  
    22<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    33  <ItemGroup Label="ProjectConfigurations"> 
     4    <ProjectConfiguration Include="Debug-Dynamic|ARM"> 
     5      <Configuration>Debug-Dynamic</Configuration> 
     6      <Platform>ARM</Platform> 
     7    </ProjectConfiguration>       
    48    <ProjectConfiguration Include="Debug-Dynamic|Win32"> 
    59      <Configuration>Debug-Dynamic</Configuration> 
    … …  
    1014      <Platform>x64</Platform> 
    1115    </ProjectConfiguration> 
     16    <ProjectConfiguration Include="Debug-Static|ARM"> 
     17      <Configuration>Debug-Static</Configuration> 
     18      <Platform>ARM</Platform> 
     19    </ProjectConfiguration>       
    1220    <ProjectConfiguration Include="Debug-Static|Win32"> 
    1321      <Configuration>Debug-Static</Configuration> 
    … …  
    1826      <Platform>x64</Platform> 
    1927    </ProjectConfiguration> 
     28    <ProjectConfiguration Include="Debug|ARM"> 
     29      <Configuration>Debug</Configuration> 
     30      <Platform>ARM</Platform> 
     31    </ProjectConfiguration>       
    2032    <ProjectConfiguration Include="Debug|Win32"> 
    2133      <Configuration>Debug</Configuration> 
    … …  
    2638      <Platform>x64</Platform> 
    2739    </ProjectConfiguration> 
     40    <ProjectConfiguration Include="Release-Dynamic|ARM"> 
     41      <Configuration>Release-Dynamic</Configuration> 
     42      <Platform>ARM</Platform> 
     43    </ProjectConfiguration>       
    2844    <ProjectConfiguration Include="Release-Dynamic|Win32"> 
    2945      <Configuration>Release-Dynamic</Configuration> 
    … …  
    3450      <Platform>x64</Platform> 
    3551    </ProjectConfiguration> 
     52    <ProjectConfiguration Include="Release-Static|ARM"> 
     53      <Configuration>Release-Static</Configuration> 
     54      <Platform>ARM</Platform> 
     55    </ProjectConfiguration>       
    3656    <ProjectConfiguration Include="Release-Static|Win32"> 
    3757      <Configuration>Release-Static</Configuration> 
    … …  
    4262      <Platform>x64</Platform> 
    4363    </ProjectConfiguration> 
     64    <ProjectConfiguration Include="Release|ARM"> 
     65      <Configuration>Release</Configuration> 
     66      <Platform>ARM</Platform> 
     67    </ProjectConfiguration>       
    4468    <ProjectConfiguration Include="Release|Win32"> 
    4569      <Configuration>Release</Configuration> 
    … …  
    126150    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aecm\echo_control_mobile.c" /> 
    127151    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core.c" /> 
    128     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_sse2.c" /> 
     152    <ClCompile Condition="$(Platform)!=ARM" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_sse2.c" /> 
    129153    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft.c" /> 
    130     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_sse2.c" /> 
     154    <ClCompile Condition="$(Platform)!=ARM" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_sse2.c" /> 
    131155    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_resampler.c" /> 
    132156    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\echo_cancellation.c" /> 
    … …  
    185209    <CharacterSet>MultiByte</CharacterSet> 
    186210  </PropertyGroup> 
     211  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 
     212    <ConfigurationType>StaticLibrary</ConfigurationType> 
     213    <PlatformToolset>v140</PlatformToolset> 
     214    <UseOfMfc>false</UseOfMfc> 
     215    <CharacterSet>MultiByte</CharacterSet> 
     216  </PropertyGroup> 
     217  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 
     218    <ConfigurationType>StaticLibrary</ConfigurationType> 
     219    <PlatformToolset>v140</PlatformToolset> 
     220    <UseOfMfc>false</UseOfMfc> 
     221  </PropertyGroup> 
     222  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 
     223    <ConfigurationType>StaticLibrary</ConfigurationType> 
     224    <PlatformToolset>v140</PlatformToolset> 
     225    <UseOfMfc>false</UseOfMfc> 
     226    <CharacterSet>MultiByte</CharacterSet> 
     227  </PropertyGroup> 
     228  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 
     229    <ConfigurationType>StaticLibrary</ConfigurationType> 
     230    <PlatformToolset>v140</PlatformToolset> 
     231    <UseOfMfc>false</UseOfMfc> 
     232    <CharacterSet>MultiByte</CharacterSet>       
     233  </PropertyGroup> 
     234  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 
     235    <ConfigurationType>StaticLibrary</ConfigurationType> 
     236    <PlatformToolset>v140</PlatformToolset> 
     237    <UseOfMfc>false</UseOfMfc> 
     238    <CharacterSet>MultiByte</CharacterSet>       
     239  </PropertyGroup> 
     240  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 
     241    <ConfigurationType>StaticLibrary</ConfigurationType> 
     242    <PlatformToolset>v140</PlatformToolset> 
     243    <UseOfMfc>false</UseOfMfc> 
     244    <CharacterSet>MultiByte</CharacterSet>       
     245  </PropertyGroup>         
    187246  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 
    188247    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    259318    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    260319  </ImportGroup> 
     320  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> 
     321    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     322    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     323    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     324  </ImportGroup> 
     325  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> 
     326    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     327    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     328    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     329  </ImportGroup> 
     330  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> 
     331    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     332    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     333    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     334  </ImportGroup> 
     335  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> 
     336    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     337    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     338    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     339  </ImportGroup> 
     340  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> 
     341    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     342    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     343    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     344  </ImportGroup> 
     345  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> 
     346    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
     347    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     348    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     349  </ImportGroup>     
    261350  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    262351    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    365454      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
    366455    </Lib> 
    367   </ItemDefinitionGroup> 
     456  </ItemDefinitionGroup>    
     457  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     458    <ClCompile> 
     459      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     460      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     461      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     462      <PrecompiledHeaderOutputFile /> 
     463    </ClCompile> 
     464    <Lib> 
     465      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     466    </Lib> 
     467  </ItemDefinitionGroup> 
     468  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     469    <ClCompile> 
     470      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     471      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     472      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     473      <PrecompiledHeaderOutputFile /> 
     474    </ClCompile> 
     475    <Lib> 
     476      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     477    </Lib> 
     478  </ItemDefinitionGroup> 
     479  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     480    <ClCompile> 
     481      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     482      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     483      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     484      <PrecompiledHeaderOutputFile /> 
     485    </ClCompile> 
     486    <Lib> 
     487      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     488    </Lib> 
     489  </ItemDefinitionGroup> 
     490  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     491    <ClCompile> 
     492      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     493      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     494      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     495      <PrecompiledHeaderOutputFile /> 
     496    </ClCompile> 
     497    <Lib> 
     498      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     499    </Lib> 
     500  </ItemDefinitionGroup> 
     501  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     502    <ClCompile> 
     503      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     504      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     505      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     506      <PrecompiledHeaderOutputFile /> 
     507    </ClCompile> 
     508    <Lib> 
     509      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     510    </Lib> 
     511  </ItemDefinitionGroup> 
     512  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     513    <ClCompile> 
     514      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     515      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     516      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     517      <PrecompiledHeaderOutputFile /> 
     518    </ClCompile> 
     519    <Lib> 
     520      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     521    </Lib> 
     522  </ItemDefinitionGroup>     
    368523  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
    369524    <Midl> 

  • pjproject/trunk/third_party/build/yuv/libyuv.vcxproj

    r5539 r5547  
    22<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    33  <ItemGroup Label="ProjectConfigurations"> 
     4    <ProjectConfiguration Include="Debug-Dynamic|ARM"> 
     5      <Configuration>Debug-Dynamic</Configuration> 
     6      <Platform>ARM</Platform> 
     7    </ProjectConfiguration>       
    48    <ProjectConfiguration Include="Debug-Dynamic|Win32"> 
    59      <Configuration>Debug-Dynamic</Configuration> 
    … …  
    1014      <Platform>x64</Platform> 
    1115    </ProjectConfiguration> 
     16    <ProjectConfiguration Include="Debug-Static|ARM"> 
     17      <Configuration>Debug-Static</Configuration> 
     18      <Platform>ARM</Platform> 
     19    </ProjectConfiguration>       
    1220    <ProjectConfiguration Include="Debug-Static|Win32"> 
    1321      <Configuration>Debug-Static</Configuration> 
    … …  
    1826      <Platform>x64</Platform> 
    1927    </ProjectConfiguration> 
     28    <ProjectConfiguration Include="Debug|ARM"> 
     29      <Configuration>Debug</Configuration> 
     30      <Platform>ARM</Platform> 
     31    </ProjectConfiguration>       
    2032    <ProjectConfiguration Include="Debug|Win32"> 
    2133      <Configuration>Debug</Configuration> 
    … …  
    2638      <Platform>x64</Platform> 
    2739    </ProjectConfiguration> 
     40    <ProjectConfiguration Include="Release-Dynamic|ARM"> 
     41      <Configuration>Release-Dynamic</Configuration> 
     42      <Platform>ARM</Platform> 
     43    </ProjectConfiguration>       
    2844    <ProjectConfiguration Include="Release-Dynamic|Win32"> 
    2945      <Configuration>Release-Dynamic</Configuration> 
    … …  
    3450      <Platform>x64</Platform> 
    3551    </ProjectConfiguration> 
     52    <ProjectConfiguration Include="Release-Static|ARM"> 
     53      <Configuration>Release-Static</Configuration> 
     54      <Platform>ARM</Platform> 
     55    </ProjectConfiguration>       
    3656    <ProjectConfiguration Include="Release-Static|Win32"> 
    3757      <Configuration>Release-Static</Configuration> 
    … …  
    4262      <Platform>x64</Platform> 
    4363    </ProjectConfiguration> 
     64    <ProjectConfiguration Include="Release|ARM"> 
     65      <Configuration>Release</Configuration> 
     66      <Platform>ARM</Platform> 
     67    </ProjectConfiguration>       
    4468    <ProjectConfiguration Include="Release|Win32"> 
    4569      <Configuration>Release</Configuration> 
    … …  
    96120    <CharacterSet>MultiByte</CharacterSet> 
    97121  </PropertyGroup> 
     122  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> 
     123    <ConfigurationType>StaticLibrary</ConfigurationType> 
     124    <PlatformToolset>v140</PlatformToolset> 
     125    <UseOfMfc>false</UseOfMfc> 
     126    <CharacterSet>MultiByte</CharacterSet> 
     127  </PropertyGroup> 
     128  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> 
     129    <ConfigurationType>StaticLibrary</ConfigurationType> 
     130    <PlatformToolset>v140</PlatformToolset> 
     131    <UseOfMfc>false</UseOfMfc> 
     132  </PropertyGroup> 
     133  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> 
     134    <ConfigurationType>StaticLibrary</ConfigurationType> 
     135    <PlatformToolset>v140</PlatformToolset> 
     136    <UseOfMfc>false</UseOfMfc> 
     137    <CharacterSet>MultiByte</CharacterSet> 
     138  </PropertyGroup> 
     139  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> 
     140    <ConfigurationType>StaticLibrary</ConfigurationType> 
     141    <PlatformToolset>v140</PlatformToolset> 
     142    <UseOfMfc>false</UseOfMfc> 
     143    <CharacterSet>MultiByte</CharacterSet>       
     144  </PropertyGroup> 
     145  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> 
     146    <ConfigurationType>StaticLibrary</ConfigurationType> 
     147    <PlatformToolset>v140</PlatformToolset> 
     148    <UseOfMfc>false</UseOfMfc> 
     149    <CharacterSet>MultiByte</CharacterSet>       
     150  </PropertyGroup> 
     151  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> 
     152    <ConfigurationType>StaticLibrary</ConfigurationType> 
     153    <PlatformToolset>v140</PlatformToolset> 
     154    <UseOfMfc>false</UseOfMfc> 
     155    <CharacterSet>MultiByte</CharacterSet>       
     156  </PropertyGroup>      
    98157  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> 
    99158    <ConfigurationType>StaticLibrary</ConfigurationType> 
    … …  
    171230    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    172231  </ImportGroup> 
     232  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|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-win32-release-defaults.props" /> 
     235    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
     236  </ImportGroup> 
     237  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|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-win32-common-defaults.props" /> 
     240    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
     241  </ImportGroup> 
     242  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|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-win32-release-defaults.props" /> 
     245    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
     246  </ImportGroup> 
     247  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|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-win32-common-defaults.props" /> 
     250    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     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-win32-release-defaults.props" /> 
     255    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-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-win32-common-defaults.props" /> 
     260    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
     261  </ImportGroup>     
    173262  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    174263    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    … …  
    279368    </Lib> 
    280369  </ItemDefinitionGroup> 
     370  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> 
     371    <ClCompile> 
     372      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     373      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     374      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     375      <PrecompiledHeaderOutputFile /> 
     376      <SDLCheck>false</SDLCheck> 
     377    </ClCompile> 
     378    <Lib> 
     379      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     380    </Lib> 
     381  </ItemDefinitionGroup> 
     382  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> 
     383    <ClCompile> 
     384      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     385      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     386      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     387      <PrecompiledHeaderOutputFile /> 
     388    </ClCompile> 
     389    <Lib> 
     390      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     391    </Lib> 
     392  </ItemDefinitionGroup> 
     393  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> 
     394    <ClCompile> 
     395      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     396      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     397      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     398      <PrecompiledHeaderOutputFile /> 
     399    </ClCompile> 
     400    <Lib> 
     401      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     402    </Lib> 
     403  </ItemDefinitionGroup> 
     404  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> 
     405    <ClCompile> 
     406      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     407      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     408      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     409      <PrecompiledHeaderOutputFile /> 
     410    </ClCompile> 
     411    <Lib> 
     412      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     413    </Lib> 
     414  </ItemDefinitionGroup> 
     415  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> 
     416    <ClCompile> 
     417      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     418      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     419      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     420      <PrecompiledHeaderOutputFile /> 
     421    </ClCompile> 
     422    <Lib> 
     423      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     424    </Lib> 
     425  </ItemDefinitionGroup> 
     426  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> 
     427    <ClCompile> 
     428      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> 
     429      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     430      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
     431      <PrecompiledHeaderOutputFile /> 
     432    </ClCompile> 
     433    <Lib> 
     434      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> 
     435    </Lib> 
     436  </ItemDefinitionGroup>     
    281437  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 
    282438    <Midl> 
Note: See TracChangeset for help on using the changeset viewer.