From 711d6259105f4452235bd6b0d85ea658388caf05 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Wed, 20 Oct 2021 03:33:31 +1100 Subject: [PATCH] project: Use dllexport instead of module definition file. --- SMP/libx264.def | 23 - SMP/libx264.vcxproj | 12 +- SMP/libx264.vcxproj.filters | 3 - SMP/libx264_files.props | 1 - SMP/libx264_winrt.vcxproj | 12 +- SMP/libx264_winrt.vcxproj.filters | 3 - ...lters => libx264bit_winrt.vcxproj.filters} | 709 +++++++++--------- 7 files changed, 361 insertions(+), 402 deletions(-) delete mode 100644 SMP/libx264.def rename SMP/{libx264bit_winrt.vcxprojy.filters => libx264bit_winrt.vcxproj.filters} (96%) diff --git a/SMP/libx264.def b/SMP/libx264.def deleted file mode 100644 index 72e004255..000000000 --- a/SMP/libx264.def +++ /dev/null @@ -1,23 +0,0 @@ -EXPORTS -x264_nal_encode -x264_param_default -x264_param_parse -x264_param_cleanup -x264_param_default_preset -x264_param_apply_fastfirstpass -x264_param_apply_profile -x264_picture_init -x264_picture_alloc -x264_picture_clean -x264_encoder_open_164 -x264_encoder_reconfig -x264_encoder_parameters -x264_encoder_headers -x264_encoder_encode -x264_encoder_close -x264_encoder_delayed_frames -x264_encoder_maximum_delayed_frames -x264_encoder_intra_refresh -x264_encoder_invalidate_reference -x264_levels ;DATA -x264_chroma_format ;DATA diff --git a/SMP/libx264.vcxproj b/SMP/libx264.vcxproj index fd01988e3..68bf89dd6 100644 --- a/SMP/libx264.vcxproj +++ b/SMP/libx264.vcxproj @@ -133,14 +133,13 @@ del /f /q $(OutDir)\licenses\x264.txt - HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions) + HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions) .\;..\;%(AdditionalIncludeDirectories) %(AdditionalOptions) StackFrameRuntimeCheck 4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings) - libx264.def libx264_10bd.lib;%(AdditionalDependencies) $(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories) @@ -195,14 +194,13 @@ del /f /q $(OutDir)\licenses\x264.txt - HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions) + HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions) .\;..\;%(AdditionalIncludeDirectories) StackFrameRuntimeCheck %(AdditionalOptions) 4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings) - libx264.def libx264_10bd.lib;%(AdditionalDependencies) $(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories) @@ -375,12 +373,11 @@ del /f /q $(OutDir)\licenses\x264.txt - HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions) + HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions) .\;..\;%(AdditionalIncludeDirectories) 4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings) - libx264.def libx264_10b.lib;%(AdditionalDependencies) $(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories) @@ -435,12 +432,11 @@ del /f /q $(OutDir)\licenses\x264.txt - HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions) + HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions) .\;..\;%(AdditionalIncludeDirectories) 4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings) - libx264.def libx264_10b.lib;%(AdditionalDependencies) $(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories) diff --git a/SMP/libx264.vcxproj.filters b/SMP/libx264.vcxproj.filters index 5691c78fb..c3c5d4cb9 100644 --- a/SMP/libx264.vcxproj.filters +++ b/SMP/libx264.vcxproj.filters @@ -283,9 +283,6 @@ Source Files\common\opencl - - Resource Files - diff --git a/SMP/libx264_files.props b/SMP/libx264_files.props index debb7f3b9..01eaafff4 100644 --- a/SMP/libx264_files.props +++ b/SMP/libx264_files.props @@ -144,7 +144,6 @@ - diff --git a/SMP/libx264_winrt.vcxproj b/SMP/libx264_winrt.vcxproj index 798fcdba4..1eb52aa37 100644 --- a/SMP/libx264_winrt.vcxproj +++ b/SMP/libx264_winrt.vcxproj @@ -133,14 +133,13 @@ del /f /q $(OutDir)\licenses\x264.txt - HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions) + HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions) .\;..\;%(AdditionalIncludeDirectories) %(AdditionalOptions) StackFrameRuntimeCheck 4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings) - libx264.def $(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories) libx264_10bd_winrt.lib;%(AdditionalDependencies) @@ -195,14 +194,13 @@ del /f /q $(OutDir)\licenses\x264.txt - HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions) + HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions) .\;..\;%(AdditionalIncludeDirectories) StackFrameRuntimeCheck %(AdditionalOptions) 4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings) - libx264.def libx264_10bd_winrt.lib;%(AdditionalDependencies) $(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories) @@ -375,12 +373,11 @@ del /f /q $(OutDir)\licenses\x264.txt - HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions) + HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions) .\;..\;%(AdditionalIncludeDirectories) 4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings) - libx264.def libx264_10b_winrt.lib;%(AdditionalDependencies) $(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories) @@ -435,12 +432,11 @@ del /f /q $(OutDir)\licenses\x264.txt - HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions) + HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions) .\;..\;%(AdditionalIncludeDirectories) 4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings) - libx264.def libx264_10b_winrt.lib;%(AdditionalDependencies) $(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories) diff --git a/SMP/libx264_winrt.vcxproj.filters b/SMP/libx264_winrt.vcxproj.filters index 5691c78fb..c3c5d4cb9 100644 --- a/SMP/libx264_winrt.vcxproj.filters +++ b/SMP/libx264_winrt.vcxproj.filters @@ -283,9 +283,6 @@ Source Files\common\opencl - - Resource Files - diff --git a/SMP/libx264bit_winrt.vcxprojy.filters b/SMP/libx264bit_winrt.vcxproj.filters similarity index 96% rename from SMP/libx264bit_winrt.vcxprojy.filters rename to SMP/libx264bit_winrt.vcxproj.filters index 93cf63367..c3c5d4cb9 100644 --- a/SMP/libx264bit_winrt.vcxprojy.filters +++ b/SMP/libx264bit_winrt.vcxproj.filters @@ -1,357 +1,354 @@ - - - - - {bc7cc560-067b-45b5-93cf-951746813aac} - - - {137db408-0f1d-432e-a147-da6e92e61e68} - - - {18bebc71-8cbf-41c4-bc1a-21f68793ff17} - - - {a6276c57-fa13-4946-89df-8f9d82e94024} - - - {8e13f554-52a8-4e7d-a1fe-d208a84e7ea8} - - - {7e3927b1-018f-4cb1-9bfc-6b66b16a30b1} - - - {a6ce58a1-9122-46af-96c2-b72f36749479} - - - {b6d71a01-1aa0-4011-884a-a32258e46159} - - - {bd0dc0c9-1336-4cec-90e6-8275ab412aae} - - - {4ca40a58-f38f-46cf-9cf0-14a17adbbf71} - - - {5a1ab630-e4ce-41c9-98c1-b09ffdfba9d2} - - - {e5117c26-5cc2-4054-9723-a8e365fadb02} - - - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\common - - - Source Files\encoder - - - Source Files\encoder - - - Source Files\encoder - - - Source Files\encoder - - - Source Files\encoder - - - Source Files\encoder - - - Source Files\encoder - - - Source Files\encoder - - - Source Files\encoder - - - Source Files\encoder - - - Source Files\common - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files - - - Source Files\encoder - - - Source Files\common - - - Source Files\common - - - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\encoder - - - Header Files\x264\encoder - - - Header Files\x264\encoder - - - Header Files\x264\encoder - - - Header Files\x264\common - - - Header Files\x264\common\x86 - - - Header Files\x264\common\x86 - - - Header Files\x264\common\x86 - - - Header Files\x264\common\x86 - - - Header Files\x264\common\x86 - - - Header Files\x264\common\x86 - - - Header Files\x264\common\opencl - - - Header Files - - - Header Files\x264\encoder - - - Header Files\x264 - - - Header Files\x264\common - - - Header Files\x264\common - - - Header Files\x264\common\x86 - - - Header Files\x264\common\x86 - - - Header Files\x264\encoder - - - Header Files\x264\common - - - Header Files - - - - - Source Files\common\opencl - - - Source Files\common\opencl - - - Source Files\common\opencl - - - Source Files\common\opencl - - - Source Files\common\opencl - - - Source Files\common\opencl - - - Resource Files - - - - - - - - Resource Files - - - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - - Source Files\common\x86 - - + + + + + {bc7cc560-067b-45b5-93cf-951746813aac} + + + {137db408-0f1d-432e-a147-da6e92e61e68} + + + {18bebc71-8cbf-41c4-bc1a-21f68793ff17} + + + {a6276c57-fa13-4946-89df-8f9d82e94024} + + + {8e13f554-52a8-4e7d-a1fe-d208a84e7ea8} + + + {7e3927b1-018f-4cb1-9bfc-6b66b16a30b1} + + + {a6ce58a1-9122-46af-96c2-b72f36749479} + + + {b6d71a01-1aa0-4011-884a-a32258e46159} + + + {bd0dc0c9-1336-4cec-90e6-8275ab412aae} + + + {4ca40a58-f38f-46cf-9cf0-14a17adbbf71} + + + {5a1ab630-e4ce-41c9-98c1-b09ffdfba9d2} + + + {e5117c26-5cc2-4054-9723-a8e365fadb02} + + + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\common + + + Source Files\encoder + + + Source Files\encoder + + + Source Files\encoder + + + Source Files\encoder + + + Source Files\encoder + + + Source Files\encoder + + + Source Files\encoder + + + Source Files\encoder + + + Source Files\encoder + + + Source Files\encoder + + + Source Files\common + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files + + + Source Files\encoder + + + Source Files\common + + + Source Files\common + + + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\encoder + + + Header Files\x264\encoder + + + Header Files\x264\encoder + + + Header Files\x264\encoder + + + Header Files\x264\common + + + Header Files\x264\common\x86 + + + Header Files\x264\common\x86 + + + Header Files\x264\common\x86 + + + Header Files\x264\common\x86 + + + Header Files\x264\common\x86 + + + Header Files\x264\common\x86 + + + Header Files\x264\common\opencl + + + Header Files + + + Header Files\x264\encoder + + + Header Files\x264 + + + Header Files\x264\common + + + Header Files\x264\common + + + Header Files\x264\common\x86 + + + Header Files\x264\common\x86 + + + Header Files\x264\encoder + + + Header Files\x264\common + + + Header Files + + + + + Source Files\common\opencl + + + Source Files\common\opencl + + + Source Files\common\opencl + + + Source Files\common\opencl + + + Source Files\common\opencl + + + Source Files\common\opencl + + + + + + + + Resource Files + + + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + + Source Files\common\x86 + + \ No newline at end of file