|
34 | 34 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
35 | 35 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
36 | 36 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
37 | | - <PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset> |
| 37 | + <PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset> |
38 | 38 | <UseOfMfc>false</UseOfMfc> |
39 | 39 | <CharacterSet>MultiByte</CharacterSet> |
40 | 40 | <WholeProgramOptimization>true</WholeProgramOptimization> |
41 | | - <BasePlatformToolset>v140_xp</BasePlatformToolset> |
| 41 | + <BasePlatformToolset>v140</BasePlatformToolset> |
42 | 42 | </PropertyGroup> |
43 | 43 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
44 | 44 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
45 | | - <PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset> |
| 45 | + <PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset> |
46 | 46 | <UseOfMfc>false</UseOfMfc> |
47 | 47 | <CharacterSet>MultiByte</CharacterSet> |
48 | 48 | <WholeProgramOptimization>true</WholeProgramOptimization> |
49 | | - <BasePlatformToolset>v140_xp</BasePlatformToolset> |
| 49 | + <BasePlatformToolset>v140</BasePlatformToolset> |
50 | 50 | </PropertyGroup> |
51 | 51 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
52 | 52 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
53 | | - <PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset> |
| 53 | + <PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset> |
54 | 54 | <UseOfMfc>false</UseOfMfc> |
55 | 55 | <CharacterSet>MultiByte</CharacterSet> |
56 | | - <BasePlatformToolset>v140_xp</BasePlatformToolset> |
| 56 | + <BasePlatformToolset>v140</BasePlatformToolset> |
57 | 57 | </PropertyGroup> |
58 | 58 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
59 | 59 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
60 | | - <PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset> |
| 60 | + <PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset> |
61 | 61 | <UseOfMfc>false</UseOfMfc> |
62 | 62 | <CharacterSet>MultiByte</CharacterSet> |
63 | | - <BasePlatformToolset>v140_xp</BasePlatformToolset> |
| 63 | + <BasePlatformToolset>v140</BasePlatformToolset> |
64 | 64 | </PropertyGroup> |
65 | 65 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Basic_no_opt|Win32'" Label="Configuration"> |
66 | 66 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
67 | | - <PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset> |
| 67 | + <PlatformToolset>v140</PlatformToolset> |
68 | 68 | <UseOfMfc>false</UseOfMfc> |
69 | 69 | <CharacterSet>MultiByte</CharacterSet> |
70 | 70 | <BasePlatformToolset>v140_xp</BasePlatformToolset> |
71 | 71 | </PropertyGroup> |
72 | 72 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Basic_no_opt|x64'" Label="Configuration"> |
73 | 73 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
74 | | - <PlatformToolset>Intel C++ Compiler 16.0</PlatformToolset> |
| 74 | + <PlatformToolset>v140</PlatformToolset> |
75 | 75 | <UseOfMfc>false</UseOfMfc> |
76 | 76 | <CharacterSet>MultiByte</CharacterSet> |
77 | 77 | <BasePlatformToolset>v140_xp</BasePlatformToolset> |
|
185 | 185 | <SuppressStartupBanner>true</SuppressStartupBanner> |
186 | 186 | <TargetMachine>MachineX86</TargetMachine> |
187 | 187 | <SubSystem>Console</SubSystem> |
| 188 | + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> |
188 | 189 | </Link> |
189 | 190 | </ItemDefinitionGroup> |
190 | 191 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Basic_no_opt|x64'"> |
|
228 | 229 | <Link> |
229 | 230 | <SuppressStartupBanner>true</SuppressStartupBanner> |
230 | 231 | <SubSystem>Console</SubSystem> |
| 232 | + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> |
231 | 233 | </Link> |
232 | 234 | </ItemDefinitionGroup> |
233 | 235 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
|
264 | 266 | <TargetMachine>MachineX86</TargetMachine> |
265 | 267 | <GenerateDebugInformation>true</GenerateDebugInformation> |
266 | 268 | <SubSystem>Console</SubSystem> |
| 269 | + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> |
267 | 270 | </Link> |
268 | 271 | </ItemDefinitionGroup> |
269 | 272 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
|
295 | 298 | <MultiProcessorCompilation>true</MultiProcessorCompilation> |
296 | 299 | <EnableExpandedLineNumberInfo>true</EnableExpandedLineNumberInfo> |
297 | 300 | <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> |
| 301 | + <AdditionalOptions>-D__is_assignable=__is_trivially_assignable %(AdditionalOptions)</AdditionalOptions> |
298 | 302 | </ClCompile> |
299 | 303 | <ResourceCompile> |
300 | 304 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
304 | 308 | <SuppressStartupBanner>true</SuppressStartupBanner> |
305 | 309 | <GenerateDebugInformation>true</GenerateDebugInformation> |
306 | 310 | <SubSystem>Console</SubSystem> |
| 311 | + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> |
307 | 312 | </Link> |
308 | 313 | </ItemDefinitionGroup> |
309 | 314 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
|
325 | 330 | <HeaderFileName /> |
326 | 331 | </Midl> |
327 | 332 | <ClCompile> |
328 | | - <Optimization>MaxSpeedHighLevel</Optimization> |
| 333 | + <Optimization>MaxSpeed</Optimization> |
329 | 334 | <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> |
330 | 335 | <IntrinsicFunctions>true</IntrinsicFunctions> |
331 | 336 | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |
|
343 | 348 | <SuppressStartupBanner>true</SuppressStartupBanner> |
344 | 349 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
345 | 350 | <GenerateAlternateCodePaths>SSE42</GenerateAlternateCodePaths> |
| 351 | + <AdditionalOptions>-D__is_assignable=__is_trivially_assignable %(AdditionalOptions)</AdditionalOptions> |
346 | 352 | </ClCompile> |
347 | 353 | <ResourceCompile> |
348 | 354 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
354 | 360 | <TargetMachine>MachineX86</TargetMachine> |
355 | 361 | <GenerateDebugInformation>false</GenerateDebugInformation> |
356 | 362 | <SubSystem>Console</SubSystem> |
| 363 | + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> |
357 | 364 | </Link> |
358 | 365 | </ItemDefinitionGroup> |
359 | 366 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
|
376 | 383 | </HeaderFileName> |
377 | 384 | </Midl> |
378 | 385 | <ClCompile> |
379 | | - <Optimization>MaxSpeedHighLevel</Optimization> |
380 | 386 | <IntrinsicFunctions>true</IntrinsicFunctions> |
381 | 387 | <OmitFramePointers>true</OmitFramePointers> |
382 | 388 | <WholeProgramOptimization>true</WholeProgramOptimization> |
|
395 | 401 | <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> |
396 | 402 | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |
397 | 403 | <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> |
| 404 | + <AdditionalOptions>-D__is_assignable=__is_trivially_assignable %(AdditionalOptions)</AdditionalOptions> |
398 | 405 | </ClCompile> |
399 | 406 | <ResourceCompile> |
400 | 407 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
405 | 412 | <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> |
406 | 413 | <GenerateDebugInformation>false</GenerateDebugInformation> |
407 | 414 | <SubSystem>Console</SubSystem> |
| 415 | + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> |
408 | 416 | </Link> |
409 | 417 | </ItemDefinitionGroup> |
410 | 418 | <ItemGroup> |
|
642 | 650 | <ClCompile Include="Interpolation.cpp" /> |
643 | 651 | <ClCompile Include="MaskFun.cpp" /> |
644 | 652 | <ClCompile Include="MDegrainN.cpp" /> |
| 653 | + <ClCompile Include="memcpy_amd.cpp" /> |
645 | 654 | <ClCompile Include="MRestoreVect.cpp" /> |
646 | 655 | <ClCompile Include="MScaleVect.cpp" /> |
647 | 656 | <ClCompile Include="MStoreVect.cpp" /> |
|
755 | 764 | <ClInclude Include="MaskFun.h" /> |
756 | 765 | <ClInclude Include="MaskFun.hpp" /> |
757 | 766 | <ClInclude Include="MDegrainN.h" /> |
| 767 | + <ClInclude Include="memcpy_amd.h" /> |
758 | 768 | <ClInclude Include="MRestoreVect.h" /> |
759 | 769 | <ClInclude Include="MScaleVect.h" /> |
760 | 770 | <ClInclude Include="MStoreVect.h" /> |
|
0 commit comments