diff --git a/examples/aobench/aobench.vcxproj b/examples/aobench/aobench.vcxproj
index 66918e2a..298be2cb 100644
--- a/examples/aobench/aobench.vcxproj
+++ b/examples/aobench/aobench.vcxproj
@@ -25,22 +25,10 @@
ao
sse2,sse4,avx1-i32x8
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
-
\ No newline at end of file
+
diff --git a/examples/aobench_instrumented/Makefile b/examples/aobench_instrumented/Makefile
index d0b27cbf..d47a5c31 100644
--- a/examples/aobench_instrumented/Makefile
+++ b/examples/aobench_instrumented/Makefile
@@ -20,7 +20,7 @@ ao: objs/ao.o objs/instrument.o objs/ao_ispc.o ../tasksys.cpp
objs/%.o: %.cpp dirs
$(CXX) $< $(CXXFLAGS) -c -o $@
-objs/ao.o: objs/ao_ispc.h
+objs/ao.o: objs/ao_instrumented_ispc.h
objs/%_ispc.h objs/%_ispc.o: %.ispc dirs
$(ISPC) $(ISPCFLAGS) $< -o objs/$*_ispc.o -h objs/$*_instrumented_ispc.h
diff --git a/examples/aobench_instrumented/ao.ispc b/examples/aobench_instrumented/ao_instrumented.ispc
similarity index 100%
rename from examples/aobench_instrumented/ao.ispc
rename to examples/aobench_instrumented/ao_instrumented.ispc
diff --git a/examples/aobench_instrumented/aobench_instrumented.vcxproj b/examples/aobench_instrumented/aobench_instrumented.vcxproj
index c1abf354..6eaf55d9 100644
--- a/examples/aobench_instrumented/aobench_instrumented.vcxproj
+++ b/examples/aobench_instrumented/aobench_instrumented.vcxproj
@@ -18,162 +18,18 @@
x64
+
+ {B3B4AE3D-6D5A-4CF9-AF5B-43CF2131B958}
+ Win32Proj
+ aobench_instrumented
+ ao_instrumented
+ sse2
+ --instrument
+
+
-
-
- Document
- $(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename)_instrumented.obj -h $(TargetDir)%(Filename)_instrumented_ispc.h --arch=x86 --instrument --target=sse2
-
- $(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename)_instrumented.obj -h $(TargetDir)%(Filename)_instrumented_ispc.h --instrument --target=sse2
-
- $(TargetDir)%(Filename)_instrumented.obj;$(TargetDir)%(Filename)_instrumented_ispc.h
- $(TargetDir)%(Filename)_instrumented.obj;$(TargetDir)%(Filename)_instrumented_ispc.h
- $(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename)_instrumented.obj -h $(TargetDir)%(Filename)_instrumented_ispc.h --arch=x86 --instrument --target=sse2
-
- $(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename)_instrumented.obj -h $(TargetDir)%(Filename)_instrumented_ispc.h --instrument --target=sse2
-
- $(TargetDir)%(Filename)_instrumented.obj;$(TargetDir)%(Filename)_instrumented_ispc.h
- $(TargetDir)%(Filename)_instrumented.obj;$(TargetDir)%(Filename)_instrumented_ispc.h
-
-
-
- {B3B4AE3D-6D5A-4CF9-AF5B-43CF2131B958}
- Win32Proj
- aobench_instrumented
- ispc
-
-
-
- Application
- true
- Unicode
- v110
-
-
- Application
- true
- Unicode
- v110
-
-
- Application
- false
- true
- Unicode
- v110
-
-
- Application
- false
- true
- Unicode
- v110
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- $(ProjectDir)..\..;$(ExecutablePath)
- true
-
-
- true
- $(ProjectDir)..\..;$(ExecutablePath)
- true
-
-
- false
- $(ProjectDir)..\..;$(ExecutablePath)
- true
-
-
- false
- $(ProjectDir)..\..;$(ExecutablePath)
- true
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
- $(TargetDir)
-
-
- Console
- true
-
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
- $(TargetDir)
-
-
- Console
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
- $(TargetDir)
-
-
- Console
- true
- true
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
- $(TargetDir)
-
-
- Console
- true
- true
- true
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/examples/common.props b/examples/common.props
index 3769330b..5cfad4fc 100644
--- a/examples/common.props
+++ b/examples/common.props
@@ -23,23 +23,27 @@
Application
true
Unicode
+ v110
Application
true
Unicode
+ v110
Application
false
true
Unicode
+ v110
Application
false
true
Unicode
+ v110
@@ -156,12 +160,12 @@
Document
- $(ISPC_compiler) -O2 %(Filename).ispc -o %(Filename).obj -h %(Filename)_ispc.h --arch=x86 --target=$(Target_str)
- $(ISPC_compiler) -O2 %(Filename).ispc -o %(Filename).obj -h %(Filename)_ispc.h --target=$(Target_str)
+ $(ISPC_compiler) -O2 %(Filename).ispc -o %(Filename).obj -h %(Filename)_ispc.h --arch=x86 --target=$(Target_str) $(flags)
+ $(ISPC_compiler) -O2 %(Filename).ispc -o %(Filename).obj -h %(Filename)_ispc.h --target=$(Target_str) $(flags)
$(Target_out)
$(Target_out)
- $(ISPC_compiler) -O2 %(Filename).ispc -o %(Filename).obj -h %(Filename)_ispc.h --arch=x86 --target=$(Target_str)
- $(ISPC_compiler) -O2 %(Filename).ispc -o %(Filename).obj -h %(Filename)_ispc.h --target=$(Target_str)
+ $(ISPC_compiler) -O2 %(Filename).ispc -o %(Filename).obj -h %(Filename)_ispc.h --arch=x86 --target=$(Target_str) $(flags)
+ $(ISPC_compiler) -O2 %(Filename).ispc -o %(Filename).obj -h %(Filename)_ispc.h --target=$(Target_str) $(flags)
$(Target_out)
$(Target_out)
diff --git a/examples/deferred/deferred_shading.vcxproj b/examples/deferred/deferred_shading.vcxproj
index 51c217ee..3e6c4c12 100755
--- a/examples/deferred/deferred_shading.vcxproj
+++ b/examples/deferred/deferred_shading.vcxproj
@@ -25,18 +25,6 @@
kernels
sse2,sse4-x2,avx1-x2
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
@@ -45,4 +33,4 @@
-
\ No newline at end of file
+
diff --git a/examples/mandelbrot/mandelbrot.vcxproj b/examples/mandelbrot/mandelbrot.vcxproj
index 406986fa..7a5f6e03 100644
--- a/examples/mandelbrot/mandelbrot.vcxproj
+++ b/examples/mandelbrot/mandelbrot.vcxproj
@@ -25,21 +25,9 @@
mandelbrot
sse2,sse4-x2,avx1-x2
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
-
\ No newline at end of file
+
diff --git a/examples/mandelbrot_tasks/mandelbrot_tasks.vcxproj b/examples/mandelbrot_tasks/mandelbrot_tasks.vcxproj
index 57f741f4..a10cd0ae 100644
--- a/examples/mandelbrot_tasks/mandelbrot_tasks.vcxproj
+++ b/examples/mandelbrot_tasks/mandelbrot_tasks.vcxproj
@@ -25,22 +25,10 @@
mandelbrot_tasks
sse2,sse4-x2,avx1-x2
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
-
\ No newline at end of file
+
diff --git a/examples/noise/noise.vcxproj b/examples/noise/noise.vcxproj
index b7f87354..f0e6e207 100644
--- a/examples/noise/noise.vcxproj
+++ b/examples/noise/noise.vcxproj
@@ -25,21 +25,9 @@
noise
sse2,sse4,avx1-x2
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
-
\ No newline at end of file
+
diff --git a/examples/options/options.vcxproj b/examples/options/options.vcxproj
index 7d21afd8..526f8450 100644
--- a/examples/options/options.vcxproj
+++ b/examples/options/options.vcxproj
@@ -25,18 +25,6 @@
options
sse2,sse4-x2,avx1-x2
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
@@ -44,4 +32,4 @@
-
\ No newline at end of file
+
diff --git a/examples/perfbench/perfbench.vcxproj b/examples/perfbench/perfbench.vcxproj
index b8a64b33..7bafb480 100644
--- a/examples/perfbench/perfbench.vcxproj
+++ b/examples/perfbench/perfbench.vcxproj
@@ -22,159 +22,12 @@
{d923bb7e-a7c8-4850-8fcf-0eb9ce35b4e8}
Win32Proj
perfbench
- ispc
+ perfbench
+ sse2-i32x4,sse4-i32x4,avx1-i32x8
-
-
- Application
- true
- Unicode
- v110
-
-
- Application
- true
- Unicode
- v110
-
-
- Application
- false
- true
- Unicode
- v110
-
-
- Application
- false
- true
- Unicode
- v110
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- $(ProjectDir)..\..;$(ExecutablePath)
-
-
- true
- $(ProjectDir)..\..;$(ExecutablePath)
-
-
- false
- $(ProjectDir)..\..;$(ExecutablePath)
-
-
- false
- $(ProjectDir)..\..;$(ExecutablePath)
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(TargetDir)
- true
- Fast
-
-
- Console
- true
-
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(TargetDir)
- true
- Fast
-
-
- Console
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(TargetDir)
- Fast
-
-
- Console
- true
- true
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(TargetDir)
- Fast
-
-
- Console
- true
- true
- true
-
-
+
-
-
- Document
- $(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename).obj -h $(TargetDir)%(Filename)_ispc.h --arch=x86 --target=sse2,sse4,avx
-
- $(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename).obj -h $(TargetDir)%(Filename)_ispc.h --target=sse2,sse4,avx
-
- $(TargetDir)%(Filename).obj;$(TargetDir)%(Filename)_sse2.obj;$(TargetDir)%(Filename)_sse4.obj;$(TargetDir)%(Filename)_avx.obj;$(TargetDir)%(Filename)_ispc.h
- $(TargetDir)%(Filename).obj;$(TargetDir)%(Filename)_sse2.obj;$(TargetDir)%(Filename)_sse4.obj;$(TargetDir)%(Filename)_avx.obj;$(TargetDir)%(Filename)_ispc.h
- $(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename).obj -h $(TargetDir)%(Filename)_ispc.h --arch=x86 --target=sse2,sse4,avx
-
- $(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename).obj -h $(TargetDir)%(Filename)_ispc.h --target=sse2,sse4,avx
-
- $(TargetDir)%(Filename).obj;$(TargetDir)%(Filename)_sse2.obj;$(TargetDir)%(Filename)_sse4.obj;$(TargetDir)%(Filename)_avx.obj;$(TargetDir)%(Filename)_ispc.h
- $(TargetDir)%(Filename).obj;$(TargetDir)%(Filename)_sse2.obj;$(TargetDir)%(Filename)_sse4.obj;$(TargetDir)%(Filename)_avx.obj;$(TargetDir)%(Filename)_ispc.h
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/examples/rt/rt.vcxproj b/examples/rt/rt.vcxproj
index 9d77fe82..38b34879 100644
--- a/examples/rt/rt.vcxproj
+++ b/examples/rt/rt.vcxproj
@@ -25,22 +25,10 @@
rt
sse2,sse4-x2,avx1-i32x8
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
-
\ No newline at end of file
+
diff --git a/examples/simple/simple.vcxproj b/examples/simple/simple.vcxproj
index 3d80467f..a540353c 100644
--- a/examples/simple/simple.vcxproj
+++ b/examples/simple/simple.vcxproj
@@ -18,160 +18,15 @@
x64
-
-
-
-
-
- Document
-
-$(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename).obj -h $(TargetDir)%(Filename)_ispc.h --arch=x86 --target=sse2
-
-
-$(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename).obj -h $(TargetDir)%(Filename)_ispc.h --target=sse2
-
- $(TargetDir)%(Filename).obj;$(TargetDir)%(Filename)_ispc.h
- $(TargetDir)%(Filename).obj;$(TargetDir)%(Filename)_ispc.h
-
-$(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename).obj -h $(TargetDir)%(Filename)_ispc.h --arch=x86 --target=sse2
-
-
-$(ISPC_compiler) -O2 %(Filename).ispc -o $(TargetDir)%(Filename).obj -h $(TargetDir)%(Filename)_ispc.h --target=sse2
-
- $(TargetDir)%(Filename).obj;$(TargetDir)%(Filename)_ispc.h
- $(TargetDir)%(Filename).obj;$(TargetDir)%(Filename)_ispc.h
-
-
{947C5311-8B78-4D05-BEE4-BCF342D4B367}
Win32Proj
simple
- ispc
+ simple
+ sse2
-
-
- Application
- true
- Unicode
- v110
-
-
- Application
- true
- Unicode
- v110
-
-
- Application
- false
- true
- Unicode
- v110
-
-
- Application
- false
- true
- Unicode
- v110
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- $(ProjectDir)..\..;$(ExecutablePath)
-
-
- true
- $(ProjectDir)..\..;$(ExecutablePath)
-
-
- false
- $(ProjectDir)..\..;$(ExecutablePath)
-
-
- false
- $(ProjectDir)..\..;$(ExecutablePath)
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(TargetDir)
-
-
- Console
- true
-
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(TargetDir)
-
-
- Console
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(TargetDir)
-
-
- Console
- true
- true
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(TargetDir)
-
-
- Console
- true
- true
- true
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
diff --git a/examples/sort/sort.vcxproj b/examples/sort/sort.vcxproj
index 98126b28..f50a16b4 100644
--- a/examples/sort/sort.vcxproj
+++ b/examples/sort/sort.vcxproj
@@ -25,22 +25,10 @@
sort
sse2,sse4-x2,avx1-x2
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
-
\ No newline at end of file
+
diff --git a/examples/stencil/stencil.vcxproj b/examples/stencil/stencil.vcxproj
index 9e339efd..168039bc 100644
--- a/examples/stencil/stencil.vcxproj
+++ b/examples/stencil/stencil.vcxproj
@@ -25,22 +25,10 @@
stencil
sse2,sse4-x2,avx1-i32x8
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
-
\ No newline at end of file
+
diff --git a/examples/volume_rendering/volume.vcxproj b/examples/volume_rendering/volume.vcxproj
index 3e2882ae..d0e3d8d0 100644
--- a/examples/volume_rendering/volume.vcxproj
+++ b/examples/volume_rendering/volume.vcxproj
@@ -25,22 +25,10 @@
volume
sse2,sse4-x2,avx1-i32x8
-
- v110
-
-
- v110
-
-
- v110
-
-
- v110
-
-
\ No newline at end of file
+