From 852871ff72a485a0a8f01d811ea57a77df5a70b1 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 15 May 2022 20:09:57 +1000 Subject: [PATCH] project: Update for recent upstream merge. --- SMP/config.asm | 2 + SMP/config.h | 2 + SMP/config_components.h | 11 +++ SMP/ffmpeg.vcxproj | 56 ++++++++++----- SMP/ffplay.vcxproj | 56 ++++++++++----- SMP/ffprobe.vcxproj | 56 ++++++++++----- SMP/libavcodec.vcxproj | 90 ++++++++++++++++--------- SMP/libavcodec.vcxproj.filters | 6 ++ SMP/libavcodec/bsf_list.c | 1 + SMP/libavcodec/dce_defs.c | 18 +++++ SMP/libavcodec_files.props | 2 + SMP/libavcodec_winrt.vcxproj | 90 ++++++++++++++++--------- SMP/libavcodec_winrt.vcxproj.filters | 6 ++ SMP/libavdevice.vcxproj | 70 +++++++++++++------ SMP/libavdevice.vcxproj.filters | 3 + SMP/libavdevice_files.props | 1 + SMP/libavdevice_winrt.vcxproj | 70 +++++++++++++------ SMP/libavdevice_winrt.vcxproj.filters | 3 + SMP/libavfilter.vcxproj | 90 ++++++++++++++++--------- SMP/libavfilter.vcxproj.filters | 15 +++++ SMP/libavfilter/filter_list.c | 4 ++ SMP/libavfilter_files.props | 5 ++ SMP/libavfilter_winrt.vcxproj | 90 ++++++++++++++++--------- SMP/libavfilter_winrt.vcxproj.filters | 15 +++++ SMP/libavformat.vcxproj | 70 +++++++++++++------ SMP/libavformat.vcxproj.filters | 18 +++++ SMP/libavformat/demuxer_list.c | 1 + SMP/libavformat/muxer_list.c | 1 + SMP/libavformat_files.props | 6 ++ SMP/libavformat_winrt.vcxproj | 70 +++++++++++++------ SMP/libavformat_winrt.vcxproj.filters | 18 +++++ SMP/libavutil.vcxproj | 90 ++++++++++++++++--------- SMP/libavutil.vcxproj.filters | 3 + SMP/libavutil_files.props | 1 + SMP/libavutil_winrt.vcxproj | 90 ++++++++++++++++--------- SMP/libavutil_winrt.vcxproj.filters | 3 + SMP/libpostproc.vcxproj | 70 +++++++++++++------ SMP/libpostproc.vcxproj.filters | 3 + SMP/libpostproc_files.props | 1 + SMP/libpostproc_winrt.vcxproj | 70 +++++++++++++------ SMP/libpostproc_winrt.vcxproj.filters | 3 + SMP/libswresample.vcxproj | 90 ++++++++++++++++--------- SMP/libswresample.vcxproj.filters | 3 + SMP/libswresample_files.props | 1 + SMP/libswresample_winrt.vcxproj | 90 ++++++++++++++++--------- SMP/libswresample_winrt.vcxproj.filters | 3 + SMP/libswscale.vcxproj | 90 ++++++++++++++++--------- SMP/libswscale.vcxproj.filters | 3 + SMP/libswscale_files.props | 1 + SMP/libswscale_winrt.vcxproj | 90 ++++++++++++++++--------- SMP/libswscale_winrt.vcxproj.filters | 3 + 51 files changed, 1186 insertions(+), 468 deletions(-) diff --git a/SMP/config.asm b/SMP/config.asm index ade64b73c8884..98b2721fd6d14 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -490,6 +490,7 @@ %define CONFIG_GNUTLS 1 %define CONFIG_JNI 0 %define CONFIG_LADSPA 0 +%define CONFIG_LCMS2 0 %define CONFIG_LIBAOM 0 %define CONFIG_LIBASS 1 %define CONFIG_LIBBLURAY 1 @@ -510,6 +511,7 @@ %define CONFIG_LIBIEC61883 0 %define CONFIG_LIBILBC 1 %define CONFIG_LIBJACK 0 +%define CONFIG_LIBJXL 0 %define CONFIG_LIBKLVANC 0 %define CONFIG_LIBKVAZAAR 0 %define CONFIG_LIBMODPLUG 1 diff --git a/SMP/config.h b/SMP/config.h index f76bb398a006a..225fc54c86524 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -581,6 +581,7 @@ #define CONFIG_GNUTLS 1 #define CONFIG_JNI 0 #define CONFIG_LADSPA 0 +#define CONFIG_LCMS2 0 #define CONFIG_LIBAOM 0 #define CONFIG_LIBASS 1 #define CONFIG_LIBBLURAY 1 @@ -601,6 +602,7 @@ #define CONFIG_LIBIEC61883 0 #define CONFIG_LIBILBC 1 #define CONFIG_LIBJACK 0 +#define CONFIG_LIBJXL 0 #define CONFIG_LIBKLVANC 0 #define CONFIG_LIBKVAZAAR 0 #define CONFIG_LIBMODPLUG 1 diff --git a/SMP/config_components.h b/SMP/config_components.h index ae79af73a4f3f..9cc22a752302a 100644 --- a/SMP/config_components.h +++ b/SMP/config_components.h @@ -49,6 +49,7 @@ #define CONFIG_NULL_BSF 1 #define CONFIG_OPUS_METADATA_BSF 1 #define CONFIG_PCM_RECHUNK_BSF 1 +#define CONFIG_PGS_FRAME_MERGE_BSF 1 #define CONFIG_PRORES_METADATA_BSF 1 #define CONFIG_REMOVE_EXTRADATA_BSF 1 #define CONFIG_SETTS_BSF 1 @@ -597,6 +598,7 @@ #define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0 #define CONFIG_LIBILBC_DECODER 1 +#define CONFIG_LIBJXL_DECODER 0 #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 #define CONFIG_LIBOPENJPEG_DECODER 0 @@ -871,6 +873,7 @@ #define CONFIG_LIBGSM_ENCODER 0 #define CONFIG_LIBGSM_MS_ENCODER 0 #define CONFIG_LIBILBC_ENCODER 1 +#define CONFIG_LIBJXL_ENCODER 0 #define CONFIG_LIBMP3LAME_ENCODER 1 #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 #define CONFIG_LIBOPENJPEG_ENCODER 0 @@ -1398,6 +1401,7 @@ #define CONFIG_BLACKFRAME_FILTER 1 #define CONFIG_BLEND_FILTER 1 #define CONFIG_BLEND_VULKAN_FILTER 0 +#define CONFIG_BLURDETECT_FILTER 1 #define CONFIG_BM3D_FILTER 1 #define CONFIG_BOXBLUR_FILTER 1 #define CONFIG_BOXBLUR_OPENCL_FILTER 0 @@ -1419,6 +1423,7 @@ #define CONFIG_COLORKEY_OPENCL_FILTER 0 #define CONFIG_COLORHOLD_FILTER 1 #define CONFIG_COLORLEVELS_FILTER 1 +#define CONFIG_COLORMAP_FILTER 1 #define CONFIG_COLORMATRIX_FILTER 1 #define CONFIG_COLORSPACE_FILTER 1 #define CONFIG_COLORTEMPERATURE_FILTER 1 @@ -1527,6 +1532,8 @@ # define CONFIG_HWUPLOAD_CUDA_FILTER 0 #endif #define CONFIG_HYSTERESIS_FILTER 1 +#define CONFIG_ICCDETECT_FILTER 0 +#define CONFIG_ICCGEN_FILTER 0 #define CONFIG_IDENTITY_FILTER 1 #define CONFIG_IDET_FILTER 1 #define CONFIG_IL_FILTER 1 @@ -1569,6 +1576,7 @@ #define CONFIG_MORPHO_FILTER 1 #define CONFIG_MPDECIMATE_FILTER 1 #define CONFIG_MSAD_FILTER 1 +#define CONFIG_MULTIPLY_FILTER 1 #define CONFIG_NEGATE_FILTER 1 #define CONFIG_NLMEANS_FILTER 1 #define CONFIG_NLMEANS_OPENCL_FILTER 0 @@ -1745,6 +1753,7 @@ #define CONFIG_ALLYUV_FILTER 1 #define CONFIG_CELLAUTO_FILTER 1 #define CONFIG_COLOR_FILTER 1 +#define CONFIG_COLORCHART_FILTER 1 #define CONFIG_COLORSPECTRUM_FILTER 1 #define CONFIG_COREIMAGESRC_FILTER 0 #define CONFIG_FREI0R_SRC_FILTER 0 @@ -2098,6 +2107,7 @@ #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1 +#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PAM_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PBM_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1 @@ -2143,6 +2153,7 @@ #define CONFIG_ASF_STREAM_MUXER 1 #define CONFIG_AU_MUXER 1 #define CONFIG_AVI_MUXER 1 +#define CONFIG_AVIF_MUXER 1 #define CONFIG_AVM2_MUXER 1 #define CONFIG_AVS2_MUXER 1 #define CONFIG_AVS3_MUXER 1 diff --git a/SMP/ffmpeg.vcxproj b/SMP/ffmpeg.vcxproj index 475608998ed4d..2e233405689a8 100644 --- a/SMP/ffmpeg.vcxproj +++ b/SMP/ffmpeg.vcxproj @@ -223,8 +223,8 @@ Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -265,6 +265,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -276,8 +279,8 @@ del ..\libavutil\ffversion.h Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -316,6 +319,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -327,8 +333,8 @@ del ..\libavutil\ffversion.h Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -369,6 +375,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -380,8 +389,8 @@ del ..\libavutil\ffversion.h Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -420,6 +429,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -434,8 +446,8 @@ del ..\libavutil\ffversion.h true true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -477,6 +489,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -491,8 +506,8 @@ del ..\libavutil\ffversion.h true true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -533,6 +548,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -546,8 +564,8 @@ del ..\libavutil\ffversion.h Level3 true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -590,6 +608,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -603,8 +624,8 @@ del ..\libavutil\ffversion.h Level3 true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -646,6 +667,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) diff --git a/SMP/ffplay.vcxproj b/SMP/ffplay.vcxproj index 8f53cd11fd9b1..42ad60208b540 100644 --- a/SMP/ffplay.vcxproj +++ b/SMP/ffplay.vcxproj @@ -219,8 +219,8 @@ Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -261,6 +261,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -272,8 +275,8 @@ del ..\libavutil\ffversion.h Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -312,6 +315,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -323,8 +329,8 @@ del ..\libavutil\ffversion.h Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -365,6 +371,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -376,8 +385,8 @@ del ..\libavutil\ffversion.h Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -416,6 +425,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -430,8 +442,8 @@ del ..\libavutil\ffversion.h true true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -473,6 +485,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -487,8 +502,8 @@ del ..\libavutil\ffversion.h true true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -529,6 +544,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -542,8 +560,8 @@ del ..\libavutil\ffversion.h Level3 true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -586,6 +604,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -599,8 +620,8 @@ del ..\libavutil\ffversion.h Level3 true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -642,6 +663,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) diff --git a/SMP/ffprobe.vcxproj b/SMP/ffprobe.vcxproj index 068a4a98bff2d..6b9b6a21923f8 100644 --- a/SMP/ffprobe.vcxproj +++ b/SMP/ffprobe.vcxproj @@ -219,8 +219,8 @@ Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -261,6 +261,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -272,8 +275,8 @@ del ..\libavutil\ffversion.h Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -312,6 +315,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -323,8 +329,8 @@ del ..\libavutil\ffversion.h Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default false @@ -365,6 +371,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -376,8 +385,8 @@ del ..\libavutil\ffversion.h Level3 - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;DEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true Default /Qvec- /Qsimd- %(AdditionalOptions) @@ -416,6 +425,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -430,8 +442,8 @@ del ..\libavutil\ffversion.h true true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -473,6 +485,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -487,8 +502,8 @@ del ..\libavutil\ffversion.h true true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_LIB;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -529,6 +544,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -542,8 +560,8 @@ del ..\libavutil\ffversion.h Level3 true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -586,6 +604,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -599,8 +620,8 @@ del ..\libavutil\ffversion.h Level3 true true - WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;%(PreprocessorDefinitions) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) true true true @@ -642,6 +663,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj index 704fed5e55122..3ae633a8014ef 100644 --- a/SMP/libavcodec.vcxproj +++ b/SMP/libavcodec.vcxproj @@ -14,7 +14,7 @@ ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -64,6 +64,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -77,19 +80,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -139,6 +142,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -152,19 +158,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -215,6 +221,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -228,19 +237,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -291,6 +300,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -304,19 +316,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -366,6 +378,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -379,19 +394,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -441,6 +456,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -454,19 +472,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -517,6 +535,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -530,19 +551,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -593,6 +614,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -606,19 +630,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -669,6 +693,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -682,19 +709,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -745,6 +772,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -758,12 +788,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters index 19433f0cd5c78..cce4bbd6fb96d 100644 --- a/SMP/libavcodec.vcxproj.filters +++ b/SMP/libavcodec.vcxproj.filters @@ -405,6 +405,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -2823,6 +2826,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec diff --git a/SMP/libavcodec/bsf_list.c b/SMP/libavcodec/bsf_list.c index cdb31b062dbd1..2876f83cd65dd 100644 --- a/SMP/libavcodec/bsf_list.c +++ b/SMP/libavcodec/bsf_list.c @@ -49,6 +49,7 @@ static const FFBitStreamFilter *bitstream_filters[] = { &ff_null_bsf, &ff_opus_metadata_bsf, &ff_pcm_rechunk_bsf, + &ff_pgs_frame_merge_bsf, &ff_prores_metadata_bsf, &ff_remove_extradata_bsf, &ff_setts_bsf, diff --git a/SMP/libavcodec/dce_defs.c b/SMP/libavcodec/dce_defs.c index 6c9d6b1805a28..a4d4a0d2d9853 100644 --- a/SMP/libavcodec/dce_defs.c +++ b/SMP/libavcodec/dce_defs.c @@ -1927,6 +1927,9 @@ void ff_hevc_put_hevc_qpel_h16_10_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _s void ff_hevc_put_hevc_qpel_h16_12_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) +void ff_hevc_put_hevc_qpel_h16_8_avx512icl(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) {return;} +#endif +#if !(ARCH_X86_64) void ff_hevc_put_hevc_qpel_h16_8_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) @@ -1954,6 +1957,9 @@ void ff_hevc_put_hevc_qpel_h32_12_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _s void ff_hevc_put_hevc_qpel_h32_8_avx2(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) +void ff_hevc_put_hevc_qpel_h32_8_avx512icl(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) {return;} +#endif +#if !(ARCH_X86_64) void ff_hevc_put_hevc_qpel_h32_8_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) @@ -1978,6 +1984,9 @@ void ff_hevc_put_hevc_qpel_h4_10_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _sr void ff_hevc_put_hevc_qpel_h4_12_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) +void ff_hevc_put_hevc_qpel_h4_8_avx512icl(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) {return;} +#endif +#if !(ARCH_X86_64) void ff_hevc_put_hevc_qpel_h4_8_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) @@ -1993,6 +2002,9 @@ void ff_hevc_put_hevc_qpel_h64_12_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _s void ff_hevc_put_hevc_qpel_h64_8_avx2(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) +void ff_hevc_put_hevc_qpel_h64_8_avx512icl(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) {return;} +#endif +#if !(ARCH_X86_64) void ff_hevc_put_hevc_qpel_h64_8_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) @@ -2002,6 +2014,9 @@ void ff_hevc_put_hevc_qpel_h8_10_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _sr void ff_hevc_put_hevc_qpel_h8_12_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) +void ff_hevc_put_hevc_qpel_h8_8_avx512icl(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) {return;} +#endif +#if !(ARCH_X86_64) void ff_hevc_put_hevc_qpel_h8_8_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) @@ -2089,6 +2104,9 @@ void ff_hevc_put_hevc_qpel_hv8_10_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _s void ff_hevc_put_hevc_qpel_hv8_12_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) +void ff_hevc_put_hevc_qpel_hv8_8_avx512icl(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) {return;} +#endif +#if !(ARCH_X86_64) void ff_hevc_put_hevc_qpel_hv8_8_sse4(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my,int width) {return;} #endif #if !(ARCH_X86_64) diff --git a/SMP/libavcodec_files.props b/SMP/libavcodec_files.props index da928b56a2105..61e3159f279df 100644 --- a/SMP/libavcodec_files.props +++ b/SMP/libavcodec_files.props @@ -137,6 +137,7 @@ + @@ -943,6 +944,7 @@ + diff --git a/SMP/libavcodec_winrt.vcxproj b/SMP/libavcodec_winrt.vcxproj index 2def354eb4ab9..ef3feb03c2bab 100644 --- a/SMP/libavcodec_winrt.vcxproj +++ b/SMP/libavcodec_winrt.vcxproj @@ -14,7 +14,7 @@ ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -64,6 +64,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -77,19 +80,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -139,6 +142,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -152,19 +158,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -215,6 +221,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -228,19 +237,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -291,6 +300,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -304,19 +316,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -366,6 +378,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -379,19 +394,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -441,6 +456,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -454,19 +472,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -517,6 +535,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -530,19 +551,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) X264_API_IMPORTS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -593,6 +614,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -606,19 +630,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) X264_API_IMPORTS;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -669,6 +693,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -682,19 +709,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) ILBC_STATIC_DEFINE;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avcodec;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -745,6 +772,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -758,12 +788,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavcodec\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\opus;$(ProjectDir)\..\..\prebuilt\include\opus;.\;..\;%(AdditionalIncludeDirectories) ILBC_STATIC_DEFINE;_MSC_VER;BUILDING_avcodec;%(PreprocessorDefinitions) diff --git a/SMP/libavcodec_winrt.vcxproj.filters b/SMP/libavcodec_winrt.vcxproj.filters index 19433f0cd5c78..cce4bbd6fb96d 100644 --- a/SMP/libavcodec_winrt.vcxproj.filters +++ b/SMP/libavcodec_winrt.vcxproj.filters @@ -405,6 +405,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -2823,6 +2826,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec diff --git a/SMP/libavdevice.vcxproj b/SMP/libavdevice.vcxproj index 61d2b61e17482..054d1400f74b0 100644 --- a/SMP/libavdevice.vcxproj +++ b/SMP/libavdevice.vcxproj @@ -11,7 +11,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -39,6 +39,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -52,14 +55,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -87,6 +90,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -100,14 +106,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -136,6 +142,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -149,14 +158,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -185,6 +194,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -198,14 +210,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -233,6 +245,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -246,14 +261,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -281,6 +296,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -294,14 +312,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -330,6 +348,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -343,14 +364,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -379,6 +400,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -392,14 +416,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -428,6 +452,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -441,14 +468,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -477,6 +504,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -490,7 +520,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) diff --git a/SMP/libavdevice.vcxproj.filters b/SMP/libavdevice.vcxproj.filters index 3d540bd1dd653..91731bd679a3a 100644 --- a/SMP/libavdevice.vcxproj.filters +++ b/SMP/libavdevice.vcxproj.filters @@ -40,6 +40,9 @@ Source Files\libavdevice + + Source Files\libavdevice + Source Files\libavdevice diff --git a/SMP/libavdevice_files.props b/SMP/libavdevice_files.props index cb324294557f0..14cfc33c1e1d1 100644 --- a/SMP/libavdevice_files.props +++ b/SMP/libavdevice_files.props @@ -15,6 +15,7 @@ + diff --git a/SMP/libavdevice_winrt.vcxproj b/SMP/libavdevice_winrt.vcxproj index ecfd8204cbd02..694ab478bc6d9 100644 --- a/SMP/libavdevice_winrt.vcxproj +++ b/SMP/libavdevice_winrt.vcxproj @@ -11,7 +11,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -39,6 +39,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -52,14 +55,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -87,6 +90,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -100,14 +106,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -136,6 +142,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -149,14 +158,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -185,6 +194,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -198,14 +210,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -233,6 +245,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -246,14 +261,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -281,6 +296,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -294,14 +312,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -330,6 +348,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -343,14 +364,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -379,6 +400,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -392,14 +416,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -428,6 +452,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -441,14 +468,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avdevice;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -477,6 +504,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -490,7 +520,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\SDL;$(ProjectDir)\..\..\prebuilt\include\SDL;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avdevice;%(PreprocessorDefinitions) diff --git a/SMP/libavdevice_winrt.vcxproj.filters b/SMP/libavdevice_winrt.vcxproj.filters index 3d540bd1dd653..91731bd679a3a 100644 --- a/SMP/libavdevice_winrt.vcxproj.filters +++ b/SMP/libavdevice_winrt.vcxproj.filters @@ -40,6 +40,9 @@ Source Files\libavdevice + + Source Files\libavdevice + Source Files\libavdevice diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index d687851b9f27f..9c253b3b94d33 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -14,7 +14,7 @@ FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -44,6 +44,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -57,19 +60,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -99,6 +102,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -112,19 +118,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -155,6 +161,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -168,19 +177,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -211,6 +220,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -224,19 +236,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -266,6 +278,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -279,19 +294,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -321,6 +336,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -334,19 +352,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -377,6 +395,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -390,19 +411,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -433,6 +454,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -446,19 +470,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -489,6 +513,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -502,19 +529,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -545,6 +572,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -558,12 +588,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index 8eccb5d9d6d0e..881cf4e0be246 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -192,6 +192,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -576,6 +579,12 @@ Source Files\libavfilter + + Source Files\libavfilter + + + Source Files\libavfilter + Source Files\libavfilter @@ -630,6 +639,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -921,6 +933,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c index 2c1437b3f7bb5..7cb64b13bdcae 100644 --- a/SMP/libavfilter/filter_list.c +++ b/SMP/libavfilter/filter_list.c @@ -169,6 +169,7 @@ static const AVFilter *filter_list[] = { &ff_vf_blackdetect, &ff_vf_blackframe, &ff_vf_blend, + &ff_vf_blurdetect, &ff_vf_bm3d, &ff_vf_boxblur, &ff_vf_bwdif, @@ -187,6 +188,7 @@ static const AVFilter *filter_list[] = { &ff_vf_colorkey, &ff_vf_colorhold, &ff_vf_colorlevels, + &ff_vf_colormap, &ff_vf_colormatrix, &ff_vf_colorspace, &ff_vf_colortemperature, @@ -318,6 +320,7 @@ static const AVFilter *filter_list[] = { &ff_vf_morpho, &ff_vf_mpdecimate, &ff_vf_msad, + &ff_vf_multiply, &ff_vf_negate, &ff_vf_nlmeans, &ff_vf_nnedi, @@ -451,6 +454,7 @@ static const AVFilter *filter_list[] = { &ff_vsrc_allyuv, &ff_vsrc_cellauto, &ff_vsrc_color, + &ff_vsrc_colorchart, &ff_vsrc_colorspectrum, &ff_vsrc_gradients, &ff_vsrc_haldclutsrc, diff --git a/SMP/libavfilter_files.props b/SMP/libavfilter_files.props index 7192174f1c9dd..6561ce2af066b 100644 --- a/SMP/libavfilter_files.props +++ b/SMP/libavfilter_files.props @@ -65,6 +65,7 @@ + @@ -193,6 +194,8 @@ + + @@ -211,6 +214,7 @@ + @@ -308,6 +312,7 @@ + diff --git a/SMP/libavfilter_winrt.vcxproj b/SMP/libavfilter_winrt.vcxproj index 98b95106768b2..0c9bd2e689288 100644 --- a/SMP/libavfilter_winrt.vcxproj +++ b/SMP/libavfilter_winrt.vcxproj @@ -14,7 +14,7 @@ FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -44,6 +44,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -57,19 +60,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -99,6 +102,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -112,19 +118,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -155,6 +161,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -168,19 +177,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -211,6 +220,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -224,19 +236,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -266,6 +278,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -279,19 +294,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -321,6 +336,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -334,19 +352,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -377,6 +395,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -390,19 +411,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -433,6 +454,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -446,19 +470,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -489,6 +513,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -502,19 +529,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) FRIBIDI_LIB_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avfilter;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -545,6 +572,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -558,12 +588,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavfilter\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\fribidi;.\;..\;%(AdditionalIncludeDirectories) FRIBIDI_LIB_STATIC;_MSC_VER;BUILDING_avfilter;%(PreprocessorDefinitions) diff --git a/SMP/libavfilter_winrt.vcxproj.filters b/SMP/libavfilter_winrt.vcxproj.filters index 8eccb5d9d6d0e..881cf4e0be246 100644 --- a/SMP/libavfilter_winrt.vcxproj.filters +++ b/SMP/libavfilter_winrt.vcxproj.filters @@ -192,6 +192,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -576,6 +579,12 @@ Source Files\libavfilter + + Source Files\libavfilter + + + Source Files\libavfilter + Source Files\libavfilter @@ -630,6 +639,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -921,6 +933,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj index b30ebb0c80889..45d278175ce61 100644 --- a/SMP/libavformat.vcxproj +++ b/SMP/libavformat.vcxproj @@ -11,7 +11,7 @@ LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -40,6 +40,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -53,14 +56,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -89,6 +92,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -102,14 +108,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -139,6 +145,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -152,14 +161,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -189,6 +198,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -202,14 +214,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -238,6 +250,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -251,14 +266,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -287,6 +302,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -300,14 +318,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -337,6 +355,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -350,14 +371,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -387,6 +408,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -400,14 +424,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -437,6 +461,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -450,14 +477,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -487,6 +514,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -500,7 +530,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters index d4045f82eb5ff..cec3f1fd79351 100644 --- a/SMP/libavformat.vcxproj.filters +++ b/SMP/libavformat.vcxproj.filters @@ -34,6 +34,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -43,6 +46,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -64,6 +70,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -88,6 +97,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -334,6 +346,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -709,6 +724,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat diff --git a/SMP/libavformat/demuxer_list.c b/SMP/libavformat/demuxer_list.c index 6cf811e5038b5..8d256cf4d4869 100644 --- a/SMP/libavformat/demuxer_list.c +++ b/SMP/libavformat/demuxer_list.c @@ -332,6 +332,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_image_j2k_pipe_demuxer, &ff_image_jpeg_pipe_demuxer, &ff_image_jpegls_pipe_demuxer, + &ff_image_jpegxl_pipe_demuxer, &ff_image_pam_pipe_demuxer, &ff_image_pbm_pipe_demuxer, &ff_image_pcx_pipe_demuxer, diff --git a/SMP/libavformat/muxer_list.c b/SMP/libavformat/muxer_list.c index b067fe689a259..a5015f11ee233 100644 --- a/SMP/libavformat/muxer_list.c +++ b/SMP/libavformat/muxer_list.c @@ -41,6 +41,7 @@ static const AVOutputFormat *muxer_list[] = { &ff_asf_stream_muxer, &ff_au_muxer, &ff_avi_muxer, + &ff_avif_muxer, &ff_avm2_muxer, &ff_avs2_muxer, &ff_avs3_muxer, diff --git a/SMP/libavformat_files.props b/SMP/libavformat_files.props index f2cf65ada95ed..58535f181ebed 100644 --- a/SMP/libavformat_files.props +++ b/SMP/libavformat_files.props @@ -13,9 +13,11 @@ + + @@ -23,6 +25,7 @@ + @@ -31,6 +34,7 @@ + @@ -113,6 +117,7 @@ + @@ -238,6 +243,7 @@ + diff --git a/SMP/libavformat_winrt.vcxproj b/SMP/libavformat_winrt.vcxproj index 86b33e1f0e24d..9a6775eee6dcf 100644 --- a/SMP/libavformat_winrt.vcxproj +++ b/SMP/libavformat_winrt.vcxproj @@ -11,7 +11,7 @@ LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -40,6 +40,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -53,14 +56,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -89,6 +92,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -102,14 +108,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -139,6 +145,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -152,14 +161,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -189,6 +198,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -202,14 +214,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -238,6 +250,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -251,14 +266,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -287,6 +302,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -300,14 +318,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -337,6 +355,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -350,14 +371,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -387,6 +408,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -400,14 +424,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -437,6 +461,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -450,14 +477,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) LIBXML_STATIC;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avformat;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -487,6 +514,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -500,7 +530,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;$(OutDir)\include\libxml2;$(ProjectDir)\..\..\prebuilt\include\libxml2;.\;..\;%(AdditionalIncludeDirectories) LIBXML_STATIC;_MSC_VER;BUILDING_avformat;%(PreprocessorDefinitions) diff --git a/SMP/libavformat_winrt.vcxproj.filters b/SMP/libavformat_winrt.vcxproj.filters index d4045f82eb5ff..cec3f1fd79351 100644 --- a/SMP/libavformat_winrt.vcxproj.filters +++ b/SMP/libavformat_winrt.vcxproj.filters @@ -34,6 +34,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -43,6 +46,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -64,6 +70,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -88,6 +97,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -334,6 +346,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -709,6 +724,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat diff --git a/SMP/libavutil.vcxproj b/SMP/libavutil.vcxproj index 7b966b0b911bf..e5ae71ac9fed8 100644 --- a/SMP/libavutil.vcxproj +++ b/SMP/libavutil.vcxproj @@ -14,7 +14,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -128,6 +128,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -141,19 +144,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -267,6 +270,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -280,19 +286,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -407,6 +413,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -420,19 +429,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -547,6 +556,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -560,19 +572,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -686,6 +698,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -699,19 +714,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -825,6 +840,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -838,19 +856,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -965,6 +983,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -978,19 +999,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -1105,6 +1126,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -1118,19 +1142,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -1245,6 +1269,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -1258,19 +1285,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -1385,6 +1412,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -1398,12 +1428,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) diff --git a/SMP/libavutil.vcxproj.filters b/SMP/libavutil.vcxproj.filters index c1ad196a3ab1f..84e533c968c6f 100644 --- a/SMP/libavutil.vcxproj.filters +++ b/SMP/libavutil.vcxproj.filters @@ -279,6 +279,9 @@ Source Files\libavutil + + Source Files\libavutil + Source Files\libavutil diff --git a/SMP/libavutil_files.props b/SMP/libavutil_files.props index b0802f18a1fae..dee3493faef53 100644 --- a/SMP/libavutil_files.props +++ b/SMP/libavutil_files.props @@ -93,6 +93,7 @@ + diff --git a/SMP/libavutil_winrt.vcxproj b/SMP/libavutil_winrt.vcxproj index 2bd431c09cfd6..171ae821c68b2 100644 --- a/SMP/libavutil_winrt.vcxproj +++ b/SMP/libavutil_winrt.vcxproj @@ -14,7 +14,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -128,6 +128,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -141,19 +144,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -267,6 +270,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -280,19 +286,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -407,6 +413,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -420,19 +429,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -547,6 +556,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -560,19 +572,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -686,6 +698,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -699,19 +714,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -825,6 +840,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -838,19 +856,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -965,6 +983,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -978,19 +999,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -1105,6 +1126,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -1118,19 +1142,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -1245,6 +1269,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -1258,19 +1285,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_avutil;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -1385,6 +1412,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -1398,12 +1428,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libavutil\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_avutil;%(PreprocessorDefinitions) diff --git a/SMP/libavutil_winrt.vcxproj.filters b/SMP/libavutil_winrt.vcxproj.filters index c1ad196a3ab1f..84e533c968c6f 100644 --- a/SMP/libavutil_winrt.vcxproj.filters +++ b/SMP/libavutil_winrt.vcxproj.filters @@ -279,6 +279,9 @@ Source Files\libavutil + + Source Files\libavutil + Source Files\libavutil diff --git a/SMP/libpostproc.vcxproj b/SMP/libpostproc.vcxproj index db0bdb5911c7e..dceaf6abf2a10 100644 --- a/SMP/libpostproc.vcxproj +++ b/SMP/libpostproc.vcxproj @@ -11,7 +11,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -39,6 +39,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -52,14 +55,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -87,6 +90,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -100,14 +106,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -136,6 +142,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -149,14 +158,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -185,6 +194,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -198,14 +210,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -233,6 +245,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -246,14 +261,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -281,6 +296,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -294,14 +312,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -330,6 +348,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -343,14 +364,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -379,6 +400,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -392,14 +416,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -428,6 +452,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -441,14 +468,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -477,6 +504,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -490,7 +520,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) diff --git a/SMP/libpostproc.vcxproj.filters b/SMP/libpostproc.vcxproj.filters index a2bcddb3f183a..8c6ecc6ec2a5c 100644 --- a/SMP/libpostproc.vcxproj.filters +++ b/SMP/libpostproc.vcxproj.filters @@ -34,6 +34,9 @@ Source Files\libpostproc + + Source Files\libpostproc + diff --git a/SMP/libpostproc_files.props b/SMP/libpostproc_files.props index 032c1f236e292..aae19f0043fe6 100644 --- a/SMP/libpostproc_files.props +++ b/SMP/libpostproc_files.props @@ -13,6 +13,7 @@ + diff --git a/SMP/libpostproc_winrt.vcxproj b/SMP/libpostproc_winrt.vcxproj index bfac10774bffa..28c4c03673eb9 100644 --- a/SMP/libpostproc_winrt.vcxproj +++ b/SMP/libpostproc_winrt.vcxproj @@ -11,7 +11,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -39,6 +39,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -52,14 +55,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -87,6 +90,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -100,14 +106,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -136,6 +142,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -149,14 +158,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -185,6 +194,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -198,14 +210,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -233,6 +245,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -246,14 +261,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -281,6 +296,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -294,14 +312,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -330,6 +348,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -343,14 +364,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -379,6 +400,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -392,14 +416,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -428,6 +452,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -441,14 +468,14 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_postproc;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -477,6 +504,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -490,7 +520,7 @@ cd $(ProjectDir) ) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_postproc;%(PreprocessorDefinitions) diff --git a/SMP/libpostproc_winrt.vcxproj.filters b/SMP/libpostproc_winrt.vcxproj.filters index a2bcddb3f183a..8c6ecc6ec2a5c 100644 --- a/SMP/libpostproc_winrt.vcxproj.filters +++ b/SMP/libpostproc_winrt.vcxproj.filters @@ -34,6 +34,9 @@ Source Files\libpostproc + + Source Files\libpostproc + diff --git a/SMP/libswresample.vcxproj b/SMP/libswresample.vcxproj index 564024d003414..496de785f9ca0 100644 --- a/SMP/libswresample.vcxproj +++ b/SMP/libswresample.vcxproj @@ -14,7 +14,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -42,6 +42,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -55,19 +58,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -95,6 +98,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -108,19 +114,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -149,6 +155,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -162,19 +171,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -203,6 +212,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -216,19 +228,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -256,6 +268,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -269,19 +284,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -309,6 +324,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -322,19 +340,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -363,6 +381,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -376,19 +397,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -417,6 +438,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -430,19 +454,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -471,6 +495,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -484,19 +511,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -525,6 +552,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -538,12 +568,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) diff --git a/SMP/libswresample.vcxproj.filters b/SMP/libswresample.vcxproj.filters index 98dbde0a27ec9..861a1f068837f 100644 --- a/SMP/libswresample.vcxproj.filters +++ b/SMP/libswresample.vcxproj.filters @@ -63,6 +63,9 @@ Source Files\libswresample + + Source Files\libswresample + Source Files\libswresample diff --git a/SMP/libswresample_files.props b/SMP/libswresample_files.props index 10140f35f5b0e..c42dacd97acbd 100644 --- a/SMP/libswresample_files.props +++ b/SMP/libswresample_files.props @@ -23,6 +23,7 @@ + diff --git a/SMP/libswresample_winrt.vcxproj b/SMP/libswresample_winrt.vcxproj index e4a44f80c1ef7..ebc16bff65422 100644 --- a/SMP/libswresample_winrt.vcxproj +++ b/SMP/libswresample_winrt.vcxproj @@ -14,7 +14,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -42,6 +42,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -55,19 +58,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -95,6 +98,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -108,19 +114,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -149,6 +155,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -162,19 +171,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -203,6 +212,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -216,19 +228,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -256,6 +268,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -269,19 +284,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -309,6 +324,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -322,19 +340,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -363,6 +381,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -376,19 +397,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -417,6 +438,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -430,19 +454,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -471,6 +495,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -484,19 +511,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swresample;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -525,6 +552,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -538,12 +568,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswresample\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swresample;%(PreprocessorDefinitions) diff --git a/SMP/libswresample_winrt.vcxproj.filters b/SMP/libswresample_winrt.vcxproj.filters index 98dbde0a27ec9..861a1f068837f 100644 --- a/SMP/libswresample_winrt.vcxproj.filters +++ b/SMP/libswresample_winrt.vcxproj.filters @@ -63,6 +63,9 @@ Source Files\libswresample + + Source Files\libswresample + Source Files\libswresample diff --git a/SMP/libswscale.vcxproj b/SMP/libswscale.vcxproj index 473233c089b94..2971d4cb71692 100644 --- a/SMP/libswscale.vcxproj +++ b/SMP/libswscale.vcxproj @@ -14,7 +14,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -42,6 +42,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -55,19 +58,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -95,6 +98,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -108,19 +114,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -149,6 +155,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -162,19 +171,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -203,6 +212,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -216,19 +228,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -256,6 +268,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -269,19 +284,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -309,6 +324,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -322,19 +340,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -363,6 +381,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -376,19 +397,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -417,6 +438,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -430,19 +454,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -471,6 +495,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -484,19 +511,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -525,6 +552,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -538,12 +568,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) diff --git a/SMP/libswscale.vcxproj.filters b/SMP/libswscale.vcxproj.filters index b5d393f82baa4..be86ccf35770c 100644 --- a/SMP/libswscale.vcxproj.filters +++ b/SMP/libswscale.vcxproj.filters @@ -87,6 +87,9 @@ Source Files\libswscale + + Source Files\libswscale + Source Files\libswscale diff --git a/SMP/libswscale_files.props b/SMP/libswscale_files.props index d7d8f33b9a720..3862ebaf268ee 100644 --- a/SMP/libswscale_files.props +++ b/SMP/libswscale_files.props @@ -31,6 +31,7 @@ + diff --git a/SMP/libswscale_winrt.vcxproj b/SMP/libswscale_winrt.vcxproj index 6c72ee55815dc..858472249f143 100644 --- a/SMP/libswscale_winrt.vcxproj +++ b/SMP/libswscale_winrt.vcxproj @@ -14,7 +14,7 @@ HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -42,6 +42,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -55,19 +58,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -95,6 +98,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -108,19 +114,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -149,6 +155,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -162,19 +171,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;DEBUG;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -203,6 +212,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -216,19 +228,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -256,6 +268,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -269,19 +284,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -309,6 +324,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -322,19 +340,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -363,6 +381,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -376,19 +397,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -417,6 +438,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -430,19 +454,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -471,6 +495,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -484,19 +511,19 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;BUILDING_swscale;%(PreprocessorDefinitions) - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) /Qvec- /Qsimd- %(AdditionalOptions) /utf-8 %(AdditionalOptions) 4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;4703;%(DisableSpecificWarnings) @@ -525,6 +552,9 @@ del ..\version.h if exist ..\config.asm ( del ..\config.asm ) +if exist ..\config_components.h ( +del ..\config_components.h +) if exist ..\libavutil\avconfig.h ( del ..\libavutil\avconfig.h ) @@ -538,12 +568,12 @@ cd $(ProjectDir) ) - $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\libswscale\x86;%(IncludePaths) + $(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\\$(ProjectName)\x86;%(IncludePaths) config.asm;%(PreIncludeFiles) false - $(ProjectDir)\..\compat\atomics\win32\;.\;..\;%(AdditionalIncludeDirectories) + $(ProjectDir)\..\compat\atomics\win32\;$(ProjectDir)\..\;.\;..\;%(AdditionalIncludeDirectories) _MSC_VER;BUILDING_swscale;%(PreprocessorDefinitions) diff --git a/SMP/libswscale_winrt.vcxproj.filters b/SMP/libswscale_winrt.vcxproj.filters index b5d393f82baa4..be86ccf35770c 100644 --- a/SMP/libswscale_winrt.vcxproj.filters +++ b/SMP/libswscale_winrt.vcxproj.filters @@ -87,6 +87,9 @@ Source Files\libswscale + + Source Files\libswscale + Source Files\libswscale