compile fix for ISPC v1.8.0

RenderKit · Oct 30, 2014 · 691bea3 · 691bea3
1 parent dae80ba
commit 691bea3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 64 deletions.
diff --git a/common/cmake/ispc.rules b/common/cmake/ispc.rules
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VisualStudioToolFile
 	Name="ISPC"
 	Version="8,00"
@@ -32,40 +32,6 @@
 						/>
 					</Values>
 				</EnumProperty>
-				<EnumProperty
-					Name="Processor"
-					DisplayName="Target Processor"
-					Description="Select Target Processor."
-					DefaultValue="1"
-					>
-					<Values>
-						<EnumValue
-							Value="0"
-							Switch="--cpu=atom"
-							DisplayName="Atom"
-						/>
-						<EnumValue
-							Value="1"
-							Switch="--cpu=penryn"
-							DisplayName="Penryn"
-						/>
-						<EnumValue
-							Value="2"
-							Switch="--cpu=core2"
-							DisplayName="Core 2"
-						/>
-						<EnumValue
-							Value="3"
-							Switch="--cpu=corei7"
-							DisplayName="Core i7"
-						/>
-						<EnumValue
-							Value="4"
-							Switch="--cpu=corei7-avx"
-							DisplayName="Core i7 AVX"
-						/>
-					</Values>
-				</EnumProperty>
 				<EnumProperty
 					Name="TargetISA"
 					DisplayName="Target ISA"

diff --git a/common/cmake/ispc.targets b/common/cmake/ispc.targets
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <PropertyPageSchema
@@ -56,7 +56,6 @@
       IncludePaths="%(ISPC.IncludePaths)"
       HeaderFile="%(ISPC.HeaderFile)"
       Architecture="%(ISPC.Architecture)"
-      Processor="%(ISPC.Processor)"
       TargetISA="%(ISPC.TargetISA)"
       WarningLevel="%(ISPC.WarningLevel)"
       MathLibrary="%(ISPC.MathLibrary)"

diff --git a/common/cmake/ispc.xml b/common/cmake/ispc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <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">
   <Rule
     Name="ISPC"
@@ -115,32 +115,6 @@
         DisplayName="x86-64"
         Switch="--arch=x86-64" />
     </EnumProperty>
-    <EnumProperty
-      Name="Processor"
-      HelpContext="0"
-      DisplayName="Target Processor"
-      Description="Select Target Processor.">
-      <EnumValue
-        Name="0"
-        DisplayName="Atom"
-        Switch="--cpu=atom" />
-      <EnumValue
-        Name="1"
-        DisplayName="Penryn"
-        Switch="--cpu=penryn" />
-      <EnumValue
-        Name="2"
-        DisplayName="Core 2"
-        Switch="--cpu=core2" />
-      <EnumValue
-        Name="3"
-        DisplayName="Core i7"
-        Switch="--cpu=corei7" />
-      <EnumValue
-        Name="4"
-        DisplayName="Core i7 AVX"
-        Switch="--cpu=corei7-avx" />
-    </EnumProperty>
     <EnumProperty
       Name="TargetISA"
       HelpContext="0"