diff --git a/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj b/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj
index d04d1a7..7be84ee 100644
--- a/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj
+++ b/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj
@@ -33,16 +33,18 @@
Application
true
Unicode
+ v110
Application
false
true
Unicode
+ v110
-
+
@@ -64,7 +66,7 @@
Level3
Disabled
WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include;C:\ProgramData\NVIDIA Corporation\NVIDIA GPU Computing SDK 4.0\C\common\inc;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)
+ C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)
Console
@@ -77,7 +79,7 @@
$(ProjectDir)$(Platform)/$(Configuration)/%(Filename)%(Extension).obj
- C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include;C:/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK 4.0/C/common/inc;../shared/glew/includes;../shared/freeglut/includes
+ C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;../shared/glew/includes;../shared/freeglut/includes
@@ -89,7 +91,7 @@
true
true
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include;C:\ProgramData\NVIDIA Corporation\NVIDIA GPU Computing SDK 4.0\C\common\inc;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)
+ C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)
Console
@@ -102,11 +104,11 @@
$(ProjectDir)$(Platform)/$(Configuration)/%(Filename)%(Extension).obj
- C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include;C:/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK 4.0/C/common/inc;../shared/glew/includes;../shared/freeglut/includes
+ C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc;../shared/glew/includes;../shared/freeglut/includes
-
+
\ No newline at end of file
diff --git a/PROJ0_WIN/CUDATEST/main.cpp b/PROJ0_WIN/CUDATEST/main.cpp
index dbb520b..eeb626e 100644
--- a/PROJ0_WIN/CUDATEST/main.cpp
+++ b/PROJ0_WIN/CUDATEST/main.cpp
@@ -12,13 +12,13 @@
int main(int argc, char* argv[]){
//Change this line to use your name!
- yourName = "[YOUR NAME HERE]";
+ yourName = "Collin Boots";
init(argc, argv);
initVAO();
initTextures();
initCuda();
-
+ printf("Major %d, Minor %d\n", major, minor);//Output version number to console
GLuint passthroughProgram;
passthroughProgram = initShader("shaders/passthroughVS.glsl", "shaders/passthroughFS.glsl");
@@ -75,7 +75,7 @@ void keyboard(unsigned char key, int x, int y)
std::cout << key << std::endl;
switch (key)
{
- case(27):
+ case(27)://ESC
exit(1);
break;
}
diff --git a/Screenshot.PNG b/Screenshot.PNG
new file mode 100644
index 0000000..3746b75
Binary files /dev/null and b/Screenshot.PNG differ