Skip to content

Commit 53569e6

Browse files
PinterfPinterf
authored andcommitted
changed vc++ project file
1 parent 52dc04a commit 53569e6

2 files changed

Lines changed: 24 additions & 12 deletions

File tree

Sources/mvtools.vcxproj

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,44 +34,44 @@
3434
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
37-
<PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset>
37+
<PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset>
3838
<UseOfMfc>false</UseOfMfc>
3939
<CharacterSet>MultiByte</CharacterSet>
4040
<WholeProgramOptimization>true</WholeProgramOptimization>
41-
<BasePlatformToolset>v140_xp</BasePlatformToolset>
41+
<BasePlatformToolset>v140</BasePlatformToolset>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4444
<ConfigurationType>DynamicLibrary</ConfigurationType>
45-
<PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset>
45+
<PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset>
4646
<UseOfMfc>false</UseOfMfc>
4747
<CharacterSet>MultiByte</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
49-
<BasePlatformToolset>v140_xp</BasePlatformToolset>
49+
<BasePlatformToolset>v140</BasePlatformToolset>
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5252
<ConfigurationType>DynamicLibrary</ConfigurationType>
53-
<PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset>
53+
<PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset>
5454
<UseOfMfc>false</UseOfMfc>
5555
<CharacterSet>MultiByte</CharacterSet>
56-
<BasePlatformToolset>v140_xp</BasePlatformToolset>
56+
<BasePlatformToolset>v140</BasePlatformToolset>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5959
<ConfigurationType>DynamicLibrary</ConfigurationType>
60-
<PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset>
60+
<PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset>
6161
<UseOfMfc>false</UseOfMfc>
6262
<CharacterSet>MultiByte</CharacterSet>
63-
<BasePlatformToolset>v140_xp</BasePlatformToolset>
63+
<BasePlatformToolset>v140</BasePlatformToolset>
6464
</PropertyGroup>
6565
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Basic_no_opt|Win32'" Label="Configuration">
6666
<ConfigurationType>DynamicLibrary</ConfigurationType>
67-
<PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset>
67+
<PlatformToolset>v140</PlatformToolset>
6868
<UseOfMfc>false</UseOfMfc>
6969
<CharacterSet>MultiByte</CharacterSet>
7070
<BasePlatformToolset>v140_xp</BasePlatformToolset>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Basic_no_opt|x64'" Label="Configuration">
7373
<ConfigurationType>DynamicLibrary</ConfigurationType>
74-
<PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset>
74+
<PlatformToolset>v140</PlatformToolset>
7575
<UseOfMfc>false</UseOfMfc>
7676
<CharacterSet>MultiByte</CharacterSet>
7777
<BasePlatformToolset>v140_xp</BasePlatformToolset>
@@ -185,6 +185,7 @@
185185
<SuppressStartupBanner>true</SuppressStartupBanner>
186186
<TargetMachine>MachineX86</TargetMachine>
187187
<SubSystem>Console</SubSystem>
188+
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
188189
</Link>
189190
</ItemDefinitionGroup>
190191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Basic_no_opt|x64'">
@@ -228,6 +229,7 @@
228229
<Link>
229230
<SuppressStartupBanner>true</SuppressStartupBanner>
230231
<SubSystem>Console</SubSystem>
232+
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
231233
</Link>
232234
</ItemDefinitionGroup>
233235
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -264,6 +266,7 @@
264266
<TargetMachine>MachineX86</TargetMachine>
265267
<GenerateDebugInformation>true</GenerateDebugInformation>
266268
<SubSystem>Console</SubSystem>
269+
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
267270
</Link>
268271
</ItemDefinitionGroup>
269272
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -295,6 +298,7 @@
295298
<MultiProcessorCompilation>true</MultiProcessorCompilation>
296299
<EnableExpandedLineNumberInfo>true</EnableExpandedLineNumberInfo>
297300
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
301+
<AdditionalOptions>-D__is_assignable=__is_trivially_assignable %(AdditionalOptions)</AdditionalOptions>
298302
</ClCompile>
299303
<ResourceCompile>
300304
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -304,6 +308,7 @@
304308
<SuppressStartupBanner>true</SuppressStartupBanner>
305309
<GenerateDebugInformation>true</GenerateDebugInformation>
306310
<SubSystem>Console</SubSystem>
311+
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
307312
</Link>
308313
</ItemDefinitionGroup>
309314
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -325,7 +330,7 @@
325330
<HeaderFileName />
326331
</Midl>
327332
<ClCompile>
328-
<Optimization>MaxSpeedHighLevel</Optimization>
333+
<Optimization>MaxSpeed</Optimization>
329334
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
330335
<IntrinsicFunctions>true</IntrinsicFunctions>
331336
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -343,6 +348,7 @@
343348
<SuppressStartupBanner>true</SuppressStartupBanner>
344349
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
345350
<GenerateAlternateCodePaths>SSE42</GenerateAlternateCodePaths>
351+
<AdditionalOptions>-D__is_assignable=__is_trivially_assignable %(AdditionalOptions)</AdditionalOptions>
346352
</ClCompile>
347353
<ResourceCompile>
348354
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -354,6 +360,7 @@
354360
<TargetMachine>MachineX86</TargetMachine>
355361
<GenerateDebugInformation>false</GenerateDebugInformation>
356362
<SubSystem>Console</SubSystem>
363+
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
357364
</Link>
358365
</ItemDefinitionGroup>
359366
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -376,7 +383,6 @@
376383
</HeaderFileName>
377384
</Midl>
378385
<ClCompile>
379-
<Optimization>MaxSpeedHighLevel</Optimization>
380386
<IntrinsicFunctions>true</IntrinsicFunctions>
381387
<OmitFramePointers>true</OmitFramePointers>
382388
<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -395,6 +401,7 @@
395401
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
396402
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
397403
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
404+
<AdditionalOptions>-D__is_assignable=__is_trivially_assignable %(AdditionalOptions)</AdditionalOptions>
398405
</ClCompile>
399406
<ResourceCompile>
400407
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -405,6 +412,7 @@
405412
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
406413
<GenerateDebugInformation>false</GenerateDebugInformation>
407414
<SubSystem>Console</SubSystem>
415+
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
408416
</Link>
409417
</ItemDefinitionGroup>
410418
<ItemGroup>
@@ -642,6 +650,7 @@
642650
<ClCompile Include="Interpolation.cpp" />
643651
<ClCompile Include="MaskFun.cpp" />
644652
<ClCompile Include="MDegrainN.cpp" />
653+
<ClCompile Include="memcpy_amd.cpp" />
645654
<ClCompile Include="MRestoreVect.cpp" />
646655
<ClCompile Include="MScaleVect.cpp" />
647656
<ClCompile Include="MStoreVect.cpp" />
@@ -755,6 +764,7 @@
755764
<ClInclude Include="MaskFun.h" />
756765
<ClInclude Include="MaskFun.hpp" />
757766
<ClInclude Include="MDegrainN.h" />
767+
<ClInclude Include="memcpy_amd.h" />
758768
<ClInclude Include="MRestoreVect.h" />
759769
<ClInclude Include="MScaleVect.h" />
760770
<ClInclude Include="MStoreVect.h" />

Sources/mvtools.vcxproj.filters

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@
192192
<ClCompile Include="MVCompensate.cpp">
193193
<Filter>Filters</Filter>
194194
</ClCompile>
195+
<ClCompile Include="memcpy_amd.cpp" />
195196
</ItemGroup>
196197
<ItemGroup>
197198
<ClInclude Include="MDegrainN.h">
@@ -450,6 +451,7 @@
450451
<ClInclude Include="version.h" />
451452
<ClInclude Include="yuy2planes.h" />
452453
<ClInclude Include="conc\Interlocked.hpp" />
454+
<ClInclude Include="memcpy_amd.h" />
453455
</ItemGroup>
454456
<ItemGroup>
455457
<CustomBuild Include="cpu.h" />

0 commit comments

Comments
 (0)