Skip to content

Commit 711d625

Browse files
SibrasSibras
committed
project: Use dllexport instead of module definition file.
1 parent ddc1932 commit 711d625

7 files changed

+361
-402
lines changed

‎SMP/libx264.def

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎SMP/libx264.vcxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,13 @@ del /f /q $(OutDir)\licenses\x264.txt
133133
</ItemDefinitionGroup>
134134
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
135135
<ClCompile>
136-
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137137
<AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138138
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
139139
<BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
140140
<DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
141141
</ClCompile>
142142
<Link>
143-
<ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
144143
<AdditionalDependencies>libx264_10bd.lib;%(AdditionalDependencies)</AdditionalDependencies>
145144
<AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
146145
</Link>
@@ -195,14 +194,13 @@ del /f /q $(OutDir)\licenses\x264.txt
195194
</ItemDefinitionGroup>
196195
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
197196
<ClCompile>
198-
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
197+
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
199198
<AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
200199
<BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
201200
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
202201
<DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
203202
</ClCompile>
204203
<Link>
205-
<ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
206204
<AdditionalDependencies>libx264_10bd.lib;%(AdditionalDependencies)</AdditionalDependencies>
207205
<AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
208206
</Link>
@@ -375,12 +373,11 @@ del /f /q $(OutDir)\licenses\x264.txt
375373
</ItemDefinitionGroup>
376374
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
377375
<ClCompile>
378-
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
376+
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
379377
<AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
380378
<DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
381379
</ClCompile>
382380
<Link>
383-
<ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
384381
<AdditionalDependencies>libx264_10b.lib;%(AdditionalDependencies)</AdditionalDependencies>
385382
<AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
386383
</Link>
@@ -435,12 +432,11 @@ del /f /q $(OutDir)\licenses\x264.txt
435432
</ItemDefinitionGroup>
436433
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
437434
<ClCompile>
438-
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
435+
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
439436
<AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
440437
<DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
441438
</ClCompile>
442439
<Link>
443-
<ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
444440
<AdditionalDependencies>libx264_10b.lib;%(AdditionalDependencies)</AdditionalDependencies>
445441
<AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
446442
</Link>

‎SMP/libx264.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,6 @@
283283
<None Include="..\common\opencl\downscale.cl">
284284
<Filter>Source Files\common\opencl</Filter>
285285
</None>
286-
<None Include="libx264.def">
287-
<Filter>Resource Files</Filter>
288-
</None>
289286
</ItemGroup>
290287
<ItemGroup>
291288
<Text Include="readme.txt" />

‎SMP/libx264_files.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@
144144
<None Include="..\common\opencl\motionsearch.cl" />
145145
<None Include="..\common\opencl\subpel.cl" />
146146
<None Include="..\common\opencl\weightp.cl" />
147-
<None Include="libx264.def" />
148147
</ItemGroup>
149148
<ItemGroup>
150149
<NASM Include="..\common\x86\cpu-a.asm">

‎SMP/libx264_winrt.vcxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,13 @@ del /f /q $(OutDir)\licenses\x264.txt
133133
</ItemDefinitionGroup>
134134
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
135135
<ClCompile>
136-
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137137
<AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138138
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
139139
<BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
140140
<DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
141141
</ClCompile>
142142
<Link>
143-
<ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
144143
<AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
145144
<AdditionalDependencies>libx264_10bd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
146145
</Link>
@@ -195,14 +194,13 @@ del /f /q $(OutDir)\licenses\x264.txt
195194
</ItemDefinitionGroup>
196195
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
197196
<ClCompile>
198-
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
197+
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
199198
<AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
200199
<BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
201200
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
202201
<DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
203202
</ClCompile>
204203
<Link>
205-
<ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
206204
<AdditionalDependencies>libx264_10bd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
207205
<AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
208206
</Link>
@@ -375,12 +373,11 @@ del /f /q $(OutDir)\licenses\x264.txt
375373
</ItemDefinitionGroup>
376374
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
377375
<ClCompile>
378-
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
376+
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
379377
<AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
380378
<DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
381379
</ClCompile>
382380
<Link>
383-
<ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
384381
<AdditionalDependencies>libx264_10b_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
385382
<AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
386383
</Link>
@@ -435,12 +432,11 @@ del /f /q $(OutDir)\licenses\x264.txt
435432
</ItemDefinitionGroup>
436433
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
437434
<ClCompile>
438-
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
435+
<PreprocessorDefinitions>HIGH_BIT_DEPTH=0;BIT_DEPTH=8;X264_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
439436
<AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
440437
<DisableSpecificWarnings>4244;4018;4146;4003;4305;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
441438
</ClCompile>
442439
<Link>
443-
<ModuleDefinitionFile>libx264.def</ModuleDefinitionFile>
444440
<AdditionalDependencies>libx264_10b_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
445441
<AdditionalLibraryDirectories>$(ProjectDir)obj\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
446442
</Link>

‎SMP/libx264_winrt.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,6 @@
283283
<None Include="..\common\opencl\downscale.cl">
284284
<Filter>Source Files\common\opencl</Filter>
285285
</None>
286-
<None Include="libx264.def">
287-
<Filter>Resource Files</Filter>
288-
</None>
289286
</ItemGroup>
290287
<ItemGroup>
291288
<Text Include="readme.txt" />

0 commit comments

Comments
 (0)