project: Use dllexport instead of module definition file.

ShiftMediaProject · Oct 19, 2021 · 711d625 · 711d625
1 parent ddc1932
commit 711d625
Show file tree

Hide file tree

Showing 7 changed files with 361 additions and 402 deletions.
diff --git a/SMP/libx264.def b/SMP/libx264.def
diff --git a/SMP/libx264.vcxproj b/SMP/libx264.vcxproj
@@ -133,14 +133,13 @@ del /f /q $(OutDir)\licenses\x264.txt
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
  <ClCompile>
- <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
  <BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
  <DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  </ClCompile>
  <Link>
- <ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
  <AdditionalDependencies>libx264_10bd.lib;%(AdditionalDependencies)</AdditionalDependencies>
  <AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
@@ -195,14 +194,13 @@ del /f /q $(OutDir)\licenses\x264.txt
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
  <ClCompile>
- <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
  <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
  <DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  </ClCompile>
  <Link>
- <ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
  <AdditionalDependencies>libx264_10bd.lib;%(AdditionalDependencies)</AdditionalDependencies>
  <AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
@@ -375,12 +373,11 @@ del /f /q $(OutDir)\licenses\x264.txt
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
  <ClCompile>
- <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  </ClCompile>
  <Link>
- <ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
  <AdditionalDependencies>libx264_10b.lib;%(AdditionalDependencies)</AdditionalDependencies>
  <AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
@@ -435,12 +432,11 @@ del /f /q $(OutDir)\licenses\x264.txt
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
  <ClCompile>
- <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  </ClCompile>
  <Link>
- <ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
  <AdditionalDependencies>libx264_10b.lib;%(AdditionalDependencies)</AdditionalDependencies>
  <AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>

diff --git a/SMP/libx264.vcxproj.filters b/SMP/libx264.vcxproj.filters
@@ -283,9 +283,6 @@
  <None Include="..\common\opencl\downscale.cl">
  <Filter>Source Files\common\opencl</Filter>
  </None>
- <None Include="libx264.def">
- <Filter>Resource Files</Filter>
- </None>
  </ItemGroup>
  <ItemGroup>
  <Text Include="readme.txt" />

diff --git a/SMP/libx264_files.props b/SMP/libx264_files.props
@@ -144,7 +144,6 @@
  <None Include="..\common\opencl\motionsearch.cl" />
  <None Include="..\common\opencl\subpel.cl" />
  <None Include="..\common\opencl\weightp.cl" />
- <None Include="libx264.def" />
  </ItemGroup>
  <ItemGroup>
  <NASM Include="..\common\x86\cpu-a.asm">

diff --git a/SMP/libx264_winrt.vcxproj b/SMP/libx264_winrt.vcxproj
@@ -133,14 +133,13 @@ del /f /q $(OutDir)\licenses\x264.txt
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
  <ClCompile>
- <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
  <BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
  <DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  </ClCompile>
  <Link>
- <ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
  <AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  <AdditionalDependencies>libx264_10bd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
  </Link>
@@ -195,14 +194,13 @@ del /f /q $(OutDir)\licenses\x264.txt
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
  <ClCompile>
- <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
  <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
  <DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  </ClCompile>
  <Link>
- <ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
  <AdditionalDependencies>libx264_10bd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
  <AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
@@ -375,12 +373,11 @@ del /f /q $(OutDir)\licenses\x264.txt
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
  <ClCompile>
- <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  </ClCompile>
  <Link>
- <ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
  <AdditionalDependencies>libx264_10b_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
  <AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
@@ -435,12 +432,11 @@ del /f /q $(OutDir)\licenses\x264.txt
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
  <ClCompile>
- <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  </ClCompile>
  <Link>
- <ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
  <AdditionalDependencies>libx264_10b_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
  <AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>

diff --git a/SMP/libx264_winrt.vcxproj.filters b/SMP/libx264_winrt.vcxproj.filters
@@ -283,9 +283,6 @@
  <None Include="..\common\opencl\downscale.cl">
  <Filter>Source Files\common\opencl</Filter>
  </None>
- <None Include="libx264.def">
- <Filter>Resource Files</Filter>
- </None>
  </ItemGroup>
  <ItemGroup>
  <Text Include="readme.txt" />