Skip to content

Commit 691bea3

Browse files
committed
compile fix for ISPC v1.8.0
1 parent dae80ba commit 691bea3

File tree

3 files changed

+3
-64
lines changed

3 files changed

+3
-64
lines changed

common/cmake/ispc.rules

+1-35
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
<VisualStudioToolFile
33
Name="ISPC"
44
Version="8,00"
@@ -32,40 +32,6 @@
3232
/>
3333
</Values>
3434
</EnumProperty>
35-
<EnumProperty
36-
Name="Processor"
37-
DisplayName="Target Processor"
38-
Description="Select Target Processor."
39-
DefaultValue="1"
40-
>
41-
<Values>
42-
<EnumValue
43-
Value="0"
44-
Switch="--cpu=atom"
45-
DisplayName="Atom"
46-
/>
47-
<EnumValue
48-
Value="1"
49-
Switch="--cpu=penryn"
50-
DisplayName="Penryn"
51-
/>
52-
<EnumValue
53-
Value="2"
54-
Switch="--cpu=core2"
55-
DisplayName="Core 2"
56-
/>
57-
<EnumValue
58-
Value="3"
59-
Switch="--cpu=corei7"
60-
DisplayName="Core i7"
61-
/>
62-
<EnumValue
63-
Value="4"
64-
Switch="--cpu=corei7-avx"
65-
DisplayName="Core i7 AVX"
66-
/>
67-
</Values>
68-
</EnumProperty>
6935
<EnumProperty
7036
Name="TargetISA"
7137
DisplayName="Target ISA"

common/cmake/ispc.targets

+1-2
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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<PropertyPageSchema
@@ -56,7 +56,6 @@
5656
IncludePaths="%(ISPC.IncludePaths)"
5757
HeaderFile="%(ISPC.HeaderFile)"
5858
Architecture="%(ISPC.Architecture)"
59-
Processor="%(ISPC.Processor)"
6059
TargetISA="%(ISPC.TargetISA)"
6160
WarningLevel="%(ISPC.WarningLevel)"
6261
MathLibrary="%(ISPC.MathLibrary)"

common/cmake/ispc.xml

+1-27
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
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
33
<Rule
44
Name="ISPC"
@@ -115,32 +115,6 @@
115115
DisplayName="x86-64"
116116
Switch="--arch=x86-64" />
117117
</EnumProperty>
118-
<EnumProperty
119-
Name="Processor"
120-
HelpContext="0"
121-
DisplayName="Target Processor"
122-
Description="Select Target Processor.">
123-
<EnumValue
124-
Name="0"
125-
DisplayName="Atom"
126-
Switch="--cpu=atom" />
127-
<EnumValue
128-
Name="1"
129-
DisplayName="Penryn"
130-
Switch="--cpu=penryn" />
131-
<EnumValue
132-
Name="2"
133-
DisplayName="Core 2"
134-
Switch="--cpu=core2" />
135-
<EnumValue
136-
Name="3"
137-
DisplayName="Core i7"
138-
Switch="--cpu=corei7" />
139-
<EnumValue
140-
Name="4"
141-
DisplayName="Core i7 AVX"
142-
Switch="--cpu=corei7-avx" />
143-
</EnumProperty>
144118
<EnumProperty
145119
Name="TargetISA"
146120
HelpContext="0"

0 commit comments

Comments
 (0)