Skip to content

Commit b89a047

Browse files
svenwoopsvenwoop
committed
bugfix in solution file, AVX2 path was not selected properly under windows
1 parent b365a46 commit b89a047

27 files changed

+234
-45
lines changed

‎common/sys/sys.vcxproj

+8-1
Original file line numberDiff line numberDiff line change
@@ -45,45 +45,52 @@
4545
<CharacterSet>NotSet</CharacterSet>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
4747
<InterproceduralOptimization>true</InterproceduralOptimization>
48+
<PlatformToolset>v120</PlatformToolset>
4849
</PropertyGroup>
4950
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAVX|Win32'" Label="Configuration">
5051
<ConfigurationType>StaticLibrary</ConfigurationType>
5152
<CharacterSet>NotSet</CharacterSet>
5253
<WholeProgramOptimization>true</WholeProgramOptimization>
5354
<InterproceduralOptimization>true</InterproceduralOptimization>
55+
<PlatformToolset>v120</PlatformToolset>
5456
</PropertyGroup>
5557
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5658
<ConfigurationType>StaticLibrary</ConfigurationType>
5759
<CharacterSet>NotSet</CharacterSet>
5860
<WholeProgramOptimization>true</WholeProgramOptimization>
5961
<InterproceduralOptimization>true</InterproceduralOptimization>
62+
<PlatformToolset>v120</PlatformToolset>
6063
</PropertyGroup>
6164
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6265
<ConfigurationType>StaticLibrary</ConfigurationType>
6366
<CharacterSet>NotSet</CharacterSet>
67+
<PlatformToolset>v120</PlatformToolset>
6468
</PropertyGroup>
6569
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAVX2|x64'" Label="Configuration">
6670
<ConfigurationType>StaticLibrary</ConfigurationType>
6771
<CharacterSet>NotSet</CharacterSet>
6872
<WholeProgramOptimization>true</WholeProgramOptimization>
6973
<InterproceduralOptimization>true</InterproceduralOptimization>
74+
<PlatformToolset>v120</PlatformToolset>
7075
</PropertyGroup>
7176
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAVX|x64'" Label="Configuration">
7277
<ConfigurationType>StaticLibrary</ConfigurationType>
7378
<CharacterSet>NotSet</CharacterSet>
7479
<WholeProgramOptimization>true</WholeProgramOptimization>
7580
<InterproceduralOptimization>true</InterproceduralOptimization>
76-
<PlatformToolset>v100</PlatformToolset>
81+
<PlatformToolset>v120</PlatformToolset>
7782
</PropertyGroup>
7883
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7984
<ConfigurationType>StaticLibrary</ConfigurationType>
8085
<CharacterSet>NotSet</CharacterSet>
8186
<WholeProgramOptimization>true</WholeProgramOptimization>
8287
<InterproceduralOptimization>true</InterproceduralOptimization>
88+
<PlatformToolset>v120</PlatformToolset>
8389
</PropertyGroup>
8490
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
8591
<ConfigurationType>StaticLibrary</ConfigurationType>
8692
<CharacterSet>NotSet</CharacterSet>
93+
<PlatformToolset>v120</PlatformToolset>
8794
</PropertyGroup>
8895
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8996
<ImportGroup Label="ExtensionSettings">

‎kernels/xeon/embree.vcxproj

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
@@ -45,45 +45,52 @@
4545
<CharacterSet>NotSet</CharacterSet>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
4747
<InterproceduralOptimization>true</InterproceduralOptimization>
48+
<PlatformToolset>v120</PlatformToolset>
4849
</PropertyGroup>
4950
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAVX|Win32'" Label="Configuration">
5051
<ConfigurationType>DynamicLibrary</ConfigurationType>
5152
<CharacterSet>NotSet</CharacterSet>
5253
<WholeProgramOptimization>true</WholeProgramOptimization>
5354
<InterproceduralOptimization>true</InterproceduralOptimization>
55+
<PlatformToolset>v120</PlatformToolset>
5456
</PropertyGroup>
5557
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5658
<ConfigurationType>DynamicLibrary</ConfigurationType>
5759
<CharacterSet>NotSet</CharacterSet>
5860
<WholeProgramOptimization>true</WholeProgramOptimization>
5961
<InterproceduralOptimization>true</InterproceduralOptimization>
62+
<PlatformToolset>v120</PlatformToolset>
6063
</PropertyGroup>
6164
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6265
<ConfigurationType>DynamicLibrary</ConfigurationType>
6366
<CharacterSet>NotSet</CharacterSet>
67+
<PlatformToolset>v120</PlatformToolset>
6468
</PropertyGroup>
6569
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAVX2|x64'" Label="Configuration">
6670
<ConfigurationType>DynamicLibrary</ConfigurationType>
6771
<CharacterSet>NotSet</CharacterSet>
6872
<WholeProgramOptimization>true</WholeProgramOptimization>
6973
<InterproceduralOptimization>true</InterproceduralOptimization>
74+
<PlatformToolset>v120</PlatformToolset>
7075
</PropertyGroup>
7176
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAVX|x64'" Label="Configuration">
7277
<ConfigurationType>DynamicLibrary</ConfigurationType>
7378
<CharacterSet>NotSet</CharacterSet>
7479
<WholeProgramOptimization>true</WholeProgramOptimization>
7580
<InterproceduralOptimization>true</InterproceduralOptimization>
76-
<PlatformToolset>v100</PlatformToolset>
81+
<PlatformToolset>v120</PlatformToolset>
7782
</PropertyGroup>
7883
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7984
<ConfigurationType>DynamicLibrary</ConfigurationType>
8085
<CharacterSet>NotSet</CharacterSet>
8186
<WholeProgramOptimization>true</WholeProgramOptimization>
8287
<InterproceduralOptimization>true</InterproceduralOptimization>
88+
<PlatformToolset>v120</PlatformToolset>
8389
</PropertyGroup>
8490
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
8591
<ConfigurationType>DynamicLibrary</ConfigurationType>
8692
<CharacterSet>NotSet</CharacterSet>
93+
<PlatformToolset>v120</PlatformToolset>
8794
</PropertyGroup>
8895
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8996
<ImportGroup Label="ExtensionSettings">
@@ -672,4 +679,4 @@
672679
<ImportGroup Label="ExtensionTargets">
673680
<Import Project="..\..\common\cmake\ispc.targets" />
674681
</ImportGroup>
675-
</Project>
682+
</Project>

‎kernels/xeon/embree_avx.vcxproj

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
@@ -45,45 +45,52 @@
4545
<CharacterSet>NotSet</CharacterSet>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
4747
<InterproceduralOptimization>true</InterproceduralOptimization>
48+
<PlatformToolset>v120</PlatformToolset>
4849
</PropertyGroup>
4950
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAVX|Win32'" Label="Configuration">
5051
<ConfigurationType>StaticLibrary</ConfigurationType>
5152
<CharacterSet>NotSet</CharacterSet>
5253
<WholeProgramOptimization>true</WholeProgramOptimization>
5354
<InterproceduralOptimization>true</InterproceduralOptimization>
55+
<PlatformToolset>v120</PlatformToolset>
5456
</PropertyGroup>
5557
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5658
<ConfigurationType>StaticLibrary</ConfigurationType>
5759
<CharacterSet>NotSet</CharacterSet>
5860
<WholeProgramOptimization>true</WholeProgramOptimization>
5961
<InterproceduralOptimization>true</InterproceduralOptimization>
62+
<PlatformToolset>v120</PlatformToolset>
6063
</PropertyGroup>
6164
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6265
<ConfigurationType>StaticLibrary</ConfigurationType>
6366
<CharacterSet>NotSet</CharacterSet>
67+
<PlatformToolset>v120</PlatformToolset>
6468
</PropertyGroup>
6569
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAVX2|x64'" Label="Configuration">
6670
<ConfigurationType>StaticLibrary</ConfigurationType>
6771
<CharacterSet>NotSet</CharacterSet>
6872
<WholeProgramOptimization>true</WholeProgramOptimization>
6973
<InterproceduralOptimization>true</InterproceduralOptimization>
74+
<PlatformToolset>v120</PlatformToolset>
7075
</PropertyGroup>
7176
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAVX|x64'" Label="Configuration">
7277
<ConfigurationType>StaticLibrary</ConfigurationType>
7378
<CharacterSet>NotSet</CharacterSet>
7479
<WholeProgramOptimization>true</WholeProgramOptimization>
7580
<InterproceduralOptimization>true</InterproceduralOptimization>
76-
<PlatformToolset>v100</PlatformToolset>
81+
<PlatformToolset>v120</PlatformToolset>
7782
</PropertyGroup>
7883
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7984
<ConfigurationType>StaticLibrary</ConfigurationType>
8085
<CharacterSet>NotSet</CharacterSet>
8186
<WholeProgramOptimization>true</WholeProgramOptimization>
8287
<InterproceduralOptimization>true</InterproceduralOptimization>
88+
<PlatformToolset>v120</PlatformToolset>
8389
</PropertyGroup>
8490
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
8591
<ConfigurationType>StaticLibrary</ConfigurationType>
8692
<CharacterSet>NotSet</CharacterSet>
93+
<PlatformToolset>v120</PlatformToolset>
8794
</PropertyGroup>
8895
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8996
<ImportGroup Label="ExtensionSettings">
@@ -163,7 +170,7 @@
163170
<IntrinsicFunctions>true</IntrinsicFunctions>
164171
<WholeProgramOptimization>false</WholeProgramOptimization>
165172
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)/kernels;$(SolutionDir)/common;$(SolutionDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
166-
<PreprocessorDefinitions>CONFIG_AVX;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
173+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
167174
<MinimalRebuild>true</MinimalRebuild>
168175
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
169176
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -190,7 +197,7 @@
190197
<IntrinsicFunctions>true</IntrinsicFunctions>
191198
<WholeProgramOptimization>false</WholeProgramOptimization>
192199
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)/kernels;$(SolutionDir)/common;$(SolutionDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
193-
<PreprocessorDefinitions>CONFIG_AVX;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194201
<MinimalRebuild>true</MinimalRebuild>
195202
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
196203
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -214,7 +221,7 @@
214221
<IntrinsicFunctions>true</IntrinsicFunctions>
215222
<WholeProgramOptimization>false</WholeProgramOptimization>
216223
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)/kernels;$(SolutionDir)/common;$(SolutionDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
217-
<PreprocessorDefinitions>CONFIG_AVX;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
224+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
218225
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
219226
<StructMemberAlignment>Default</StructMemberAlignment>
220227
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -240,7 +247,7 @@
240247
<IntrinsicFunctions>true</IntrinsicFunctions>
241248
<WholeProgramOptimization>false</WholeProgramOptimization>
242249
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)/kernels;$(SolutionDir)/common;$(SolutionDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
243-
<PreprocessorDefinitions>CONFIG_AVX;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
250+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
244251
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
245252
<StructMemberAlignment>Default</StructMemberAlignment>
246253
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -312,7 +319,7 @@
312319
<IntrinsicFunctions>true</IntrinsicFunctions>
313320
<WholeProgramOptimization>false</WholeProgramOptimization>
314321
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)/kernels;$(SolutionDir)/common;$(SolutionDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
315-
<PreprocessorDefinitions>CONFIG_AVX;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
322+
<PreprocessorDefinitions>CONFIG_AVX2;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
316323
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
317324
<StructMemberAlignment>Default</StructMemberAlignment>
318325
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -338,7 +345,7 @@
338345
<IntrinsicFunctions>true</IntrinsicFunctions>
339346
<WholeProgramOptimization>false</WholeProgramOptimization>
340347
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)/kernels;$(SolutionDir)/common;$(SolutionDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
341-
<PreprocessorDefinitions>CONFIG_AVX;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
348+
<PreprocessorDefinitions>CONFIG_AVX2;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
342349
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
343350
<StructMemberAlignment>Default</StructMemberAlignment>
344351
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -448,4 +455,4 @@
448455
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
449456
<ImportGroup Label="ExtensionTargets">
450457
</ImportGroup>
451-
</Project>
458+
</Project>

0 commit comments

Comments
 (0)