diff options
-rw-r--r-- | pjmedia/build/pjmedia.vcxproj | 24 | ||||
-rw-r--r-- | pjproject-vs14.sln | 36 | ||||
-rw-r--r-- | third_party/build/srtp/libsrtp.vcxproj | 36 | ||||
-rw-r--r-- | third_party/build/webrtc/libwebrtc.vcxproj | 159 | ||||
-rw-r--r-- | third_party/build/yuv/libyuv.vcxproj | 156 |
5 files changed, 379 insertions, 32 deletions
diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj index acdc1de1..ae674dac 100644 --- a/pjmedia/build/pjmedia.vcxproj +++ b/pjmedia/build/pjmedia.vcxproj @@ -313,8 +313,8 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <ClCompile> - <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> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <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> + <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -338,8 +338,8 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ClCompile> - <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> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <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> + <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -364,8 +364,8 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> <ClCompile> - <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> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <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> + <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -390,8 +390,8 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> <ClCompile> - <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> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <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> + <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -415,8 +415,8 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> <ClCompile> - <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> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <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> + <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -441,8 +441,8 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> <ClCompile> - <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> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <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> + <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> diff --git a/pjproject-vs14.sln b/pjproject-vs14.sln index 4f5bd30d..3b256d74 100644 --- a/pjproject-vs14.sln +++ b/pjproject-vs14.sln @@ -1848,73 +1848,85 @@ Global {9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|x64.ActiveCfg = Release|x64 {9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|x64.Build.0 = Release|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM.ActiveCfg = Debug|Win32 + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM.ActiveCfg = Debug|ARM + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM.Build.0 = Debug|ARM {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.ActiveCfg = Debug|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.Build.0 = Debug|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|x64.ActiveCfg = Debug|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|x64.Build.0 = Debug|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32 - {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32 + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32 - {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32 + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM.Build.0 = Debug-Static|ARM {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|x64.ActiveCfg = Debug-Static|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|x64.Build.0 = Debug-Static|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Any CPU.ActiveCfg = Release|Win32 - {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM.ActiveCfg = Release|Win32 + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM.ActiveCfg = Release|ARM + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM.Build.0 = Release|ARM {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.ActiveCfg = Release|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.Build.0 = Release|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|x64.ActiveCfg = Release|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|x64.Build.0 = Release|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32 - {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32 + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32 - {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM.ActiveCfg = Release-Static|Win32 + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM.ActiveCfg = Release-Static|ARM + {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM.Build.0 = Release-Static|ARM {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.Build.0 = Release-Static|Win32 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x64.ActiveCfg = Release-Static|x64 {6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x64.Build.0 = Release-Static|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM.ActiveCfg = Debug|Win32 + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM.ActiveCfg = Debug|ARM + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM.Build.0 = Debug|ARM {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Win32.ActiveCfg = Debug|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Win32.Build.0 = Debug|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|x64.ActiveCfg = Debug|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|x64.Build.0 = Debug|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32 - {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32 + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32 - {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32 + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM.Build.0 = Debug-Static|ARM {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|x64.ActiveCfg = Debug-Static|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|x64.Build.0 = Debug-Static|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Any CPU.ActiveCfg = Release|Win32 - {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM.ActiveCfg = Release|Win32 + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM.ActiveCfg = Release|ARM + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM.Build.0 = Release|ARM {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Win32.ActiveCfg = Release|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Win32.Build.0 = Release|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|x64.ActiveCfg = Release|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|x64.Build.0 = Release|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32 - {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32 + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32 - {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM.ActiveCfg = Release-Static|Win32 + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM.ActiveCfg = Release-Static|ARM + {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM.Build.0 = Release-Static|ARM {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Win32.Build.0 = Release-Static|Win32 {5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|x64.ActiveCfg = Release-Static|x64 diff --git a/third_party/build/srtp/libsrtp.vcxproj b/third_party/build/srtp/libsrtp.vcxproj index 77945827..a19b2a92 100644 --- a/third_party/build/srtp/libsrtp.vcxproj +++ b/third_party/build/srtp/libsrtp.vcxproj @@ -297,7 +297,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -332,7 +332,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -366,7 +366,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -401,7 +401,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -435,7 +435,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -470,7 +470,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> <ClCompile> <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> </ClCompile> @@ -507,6 +507,12 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm.c" /> <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm_ossl.c"> @@ -522,6 +528,12 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\..\srtp\crypto\cipher\cipher.c" /> <ClCompile Include="..\..\srtp\crypto\cipher\null_cipher.c" /> @@ -540,6 +552,12 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\..\srtp\crypto\hash\null_auth.c" /> <ClCompile Include="..\..\srtp\crypto\hash\sha1.c" /> @@ -570,6 +588,12 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\..\srtp\pjlib\srtp_err.c" /> <ClCompile Include="..\..\srtp\srtp\srtp.c" /> diff --git a/third_party/build/webrtc/libwebrtc.vcxproj b/third_party/build/webrtc/libwebrtc.vcxproj index 011d3092..3f41fee1 100644 --- a/third_party/build/webrtc/libwebrtc.vcxproj +++ b/third_party/build/webrtc/libwebrtc.vcxproj @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug-Dynamic|ARM"> + <Configuration>Debug-Dynamic</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug-Dynamic|Win32"> <Configuration>Debug-Dynamic</Configuration> <Platform>Win32</Platform> @@ -9,6 +13,10 @@ <Configuration>Debug-Dynamic</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug-Static|ARM"> + <Configuration>Debug-Static</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug-Static|Win32"> <Configuration>Debug-Static</Configuration> <Platform>Win32</Platform> @@ -17,6 +25,10 @@ <Configuration>Debug-Static</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -25,6 +37,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release-Dynamic|ARM"> + <Configuration>Release-Dynamic</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release-Dynamic|Win32"> <Configuration>Release-Dynamic</Configuration> <Platform>Win32</Platform> @@ -33,6 +49,10 @@ <Configuration>Release-Dynamic</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release-Static|ARM"> + <Configuration>Release-Static</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release-Static|Win32"> <Configuration>Release-Static</Configuration> <Platform>Win32</Platform> @@ -41,6 +61,10 @@ <Configuration>Release-Static</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -125,9 +149,9 @@ <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aecm\aecm_core_c.c" /> <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aecm\echo_control_mobile.c" /> <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core.c" /> - <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_sse2.c" /> + <ClCompile Condition="$(Platform)!=ARM" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_sse2.c" /> <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft.c" /> - <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_sse2.c" /> + <ClCompile Condition="$(Platform)!=ARM" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_sse2.c" /> <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_resampler.c" /> <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\echo_cancellation.c" /> <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\ns\noise_suppression.c" /> @@ -184,6 +208,41 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> @@ -258,6 +317,36 @@ <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> @@ -364,7 +453,73 @@ <Lib> <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> <TargetEnvironment>X64</TargetEnvironment> diff --git a/third_party/build/yuv/libyuv.vcxproj b/third_party/build/yuv/libyuv.vcxproj index 13a49a55..f0fa922a 100644 --- a/third_party/build/yuv/libyuv.vcxproj +++ b/third_party/build/yuv/libyuv.vcxproj @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug-Dynamic|ARM"> + <Configuration>Debug-Dynamic</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug-Dynamic|Win32"> <Configuration>Debug-Dynamic</Configuration> <Platform>Win32</Platform> @@ -9,6 +13,10 @@ <Configuration>Debug-Dynamic</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug-Static|ARM"> + <Configuration>Debug-Static</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug-Static|Win32"> <Configuration>Debug-Static</Configuration> <Platform>Win32</Platform> @@ -17,6 +25,10 @@ <Configuration>Debug-Static</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -25,6 +37,10 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release-Dynamic|ARM"> + <Configuration>Release-Dynamic</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release-Dynamic|Win32"> <Configuration>Release-Dynamic</Configuration> <Platform>Win32</Platform> @@ -33,6 +49,10 @@ <Configuration>Release-Dynamic</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release-Static|ARM"> + <Configuration>Release-Static</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release-Static|Win32"> <Configuration>Release-Static</Configuration> <Platform>Win32</Platform> @@ -41,6 +61,10 @@ <Configuration>Release-Static</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -95,6 +119,41 @@ <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v140</PlatformToolset> @@ -170,6 +229,36 @@ <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> + <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> @@ -278,6 +367,73 @@ <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> </Lib> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + <SDLCheck>false</SDLCheck> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'"> + <ClCompile> + <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderOutputFile /> + </ClCompile> + <Lib> + <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> <TargetEnvironment>X64</TargetEnvironment> |