From d644d45f313e7814de74070a293c81063823f5e1 Mon Sep 17 00:00:00 2001 From: Riza Sulistyo Date: Wed, 25 Jan 2017 07:52:32 +0000 Subject: Re #1900: Fixed some build error for UWP arm. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5547 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/build/pjmedia.vcxproj | 24 ++--- pjproject-vs14.sln | 36 ++++--- third_party/build/srtp/libsrtp.vcxproj | 36 +++++-- third_party/build/webrtc/libwebrtc.vcxproj | 159 ++++++++++++++++++++++++++++- 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 @@ - ../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) - _LIB;%(PreprocessorDefinitions) + ../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) + _LIB;__ARMEL__;%(PreprocessorDefinitions) @@ -338,8 +338,8 @@ - ../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) - _LIB;%(PreprocessorDefinitions) + ../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) + _LIB;__ARMEL__;%(PreprocessorDefinitions) @@ -364,8 +364,8 @@ - ../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) - _LIB;%(PreprocessorDefinitions) + ../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) + _LIB;__ARMEL__;%(PreprocessorDefinitions) @@ -390,8 +390,8 @@ - ../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) - _LIB;%(PreprocessorDefinitions) + ../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) + _LIB;__ARMEL__;%(PreprocessorDefinitions) @@ -415,8 +415,8 @@ - ../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) - _LIB;%(PreprocessorDefinitions) + ../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) + _LIB;__ARMEL__;%(PreprocessorDefinitions) @@ -441,8 +441,8 @@ - ../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) - _LIB;%(PreprocessorDefinitions) + ../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) + _LIB;__ARMEL__;%(PreprocessorDefinitions) 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 @@ .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) @@ -332,7 +332,7 @@ .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) @@ -366,7 +366,7 @@ .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) @@ -401,7 +401,7 @@ .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) @@ -435,7 +435,7 @@ .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) @@ -470,7 +470,7 @@ .;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories) - _LIB;%(PreprocessorDefinitions) + _LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) @@ -507,6 +507,12 @@ true true true + true + true + true + true + true + true @@ -522,6 +528,12 @@ true true true + true + true + true + true + true + true @@ -540,6 +552,12 @@ true true true + true + true + true + true + true + true @@ -570,6 +588,12 @@ true true true + true + true + true + true + true + true 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 @@  + + Debug-Dynamic + ARM + Debug-Dynamic Win32 @@ -9,6 +13,10 @@ Debug-Dynamic x64 + + Debug-Static + ARM + Debug-Static Win32 @@ -17,6 +25,10 @@ Debug-Static x64 + + Debug + ARM + Debug Win32 @@ -25,6 +37,10 @@ Debug x64 + + Release-Dynamic + ARM + Release-Dynamic Win32 @@ -33,6 +49,10 @@ Release-Dynamic x64 + + Release-Static + ARM + Release-Static Win32 @@ -41,6 +61,10 @@ Release-Static x64 + + Release + ARM + Release Win32 @@ -125,9 +149,9 @@ - + - + @@ -184,6 +208,41 @@ false MultiByte + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + StaticLibrary v140 @@ -258,6 +317,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -364,7 +453,73 @@ ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../webrtc/src;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + X64 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 @@  + + Debug-Dynamic + ARM + Debug-Dynamic Win32 @@ -9,6 +13,10 @@ Debug-Dynamic x64 + + Debug-Static + ARM + Debug-Static Win32 @@ -17,6 +25,10 @@ Debug-Static x64 + + Debug + ARM + Debug Win32 @@ -25,6 +37,10 @@ Debug x64 + + Release-Dynamic + ARM + Release-Dynamic Win32 @@ -33,6 +49,10 @@ Release-Dynamic x64 + + Release-Static + ARM + Release-Static Win32 @@ -41,6 +61,10 @@ Release-Static x64 + + Release + ARM + Release Win32 @@ -95,6 +119,41 @@ false MultiByte + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + + + StaticLibrary + v140 + false + MultiByte + StaticLibrary v140 @@ -170,6 +229,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -278,6 +367,73 @@ ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + false + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + + + + /wd4100 /wd4244 /wd4127 %(AdditionalOptions) + .;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories) + _LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + + ..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib + + X64 -- cgit v1.2.3