diff --git a/PROJ0_WIN/CUDATEST.sdf b/PROJ0_WIN/CUDATEST.sdf new file mode 100644 index 0000000..2f10c5f Binary files /dev/null and b/PROJ0_WIN/CUDATEST.sdf differ diff --git a/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj b/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj index d04d1a7..81b8e97 100644 --- a/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj +++ b/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj @@ -39,6 +39,7 @@ false true Unicode + C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5 @@ -69,7 +70,7 @@ Console true - ../shared/glew/lib;../shared/freeglut/lib;%(AdditionalLibraryDirectories) + ../shared/glew/lib;../shared/freeglut/lib;%(AdditionalLibraryDirectories);C:\ProgramData\NVIDIA Corporation\CUDA Samples\v4.0\common\inc cudart.lib; glew32.lib;glu32.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) mainCRTStartup @@ -78,6 +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 + true @@ -89,24 +91,24 @@ 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 true true true - ../shared/glew/lib;../shared/freeglut/lib;%(AdditionalLibraryDirectories) + ../shared/glew/lib;../shared/freeglut/lib;%(AdditionalLibraryDirectories); C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc cudart.lib; glew32.lib;glu32.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) mainCRTStartup $(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/glew32.dll b/PROJ0_WIN/CUDATEST/glew32.dll new file mode 100644 index 0000000..999a59b Binary files /dev/null and b/PROJ0_WIN/CUDATEST/glew32.dll differ diff --git a/PROJ0_WIN/CUDATEST/glut32.dll b/PROJ0_WIN/CUDATEST/glut32.dll new file mode 100644 index 0000000..106646f Binary files /dev/null and b/PROJ0_WIN/CUDATEST/glut32.dll differ diff --git a/PROJ0_WIN/CUDATEST/kernel.h b/PROJ0_WIN/CUDATEST/kernel.h index 0e305ed..10392f3 100644 --- a/PROJ0_WIN/CUDATEST/kernel.h +++ b/PROJ0_WIN/CUDATEST/kernel.h @@ -10,7 +10,7 @@ #include #if CUDA_VERSION >= 5000 - #include + #include #else #include #endif diff --git a/PROJ0_WIN/CUDATEST/main.cpp b/PROJ0_WIN/CUDATEST/main.cpp index dbb520b..71055f2 100644 --- a/PROJ0_WIN/CUDATEST/main.cpp +++ b/PROJ0_WIN/CUDATEST/main.cpp @@ -12,7 +12,7 @@ int main(int argc, char* argv[]){ //Change this line to use your name! - yourName = "[YOUR NAME HERE]"; + yourName = "Harmony Li"; init(argc, argv); initVAO(); diff --git a/PROJ0_WIN/CUDATEST/main.h b/PROJ0_WIN/CUDATEST/main.h index 4cb7d59..a144d81 100644 --- a/PROJ0_WIN/CUDATEST/main.h +++ b/PROJ0_WIN/CUDATEST/main.h @@ -13,8 +13,8 @@ #include #if CUDART_VERSION >= 5000 - #include - #include + #include + #include #else #include #include diff --git a/PROJ0_WIN/CUDATEST/vc100.pdb b/PROJ0_WIN/CUDATEST/vc100.pdb new file mode 100644 index 0000000..55667b9 Binary files /dev/null and b/PROJ0_WIN/CUDATEST/vc100.pdb differ diff --git a/PROJ0_WIN/ipch/cudatest-f763d90c/cudatest-a82bf63.ipch b/PROJ0_WIN/ipch/cudatest-f763d90c/cudatest-a82bf63.ipch new file mode 100644 index 0000000..4a4c961 Binary files /dev/null and b/PROJ0_WIN/ipch/cudatest-f763d90c/cudatest-a82bf63.ipch differ diff --git a/Screenshot.png b/Screenshot.png new file mode 100644 index 0000000..90d78bb Binary files /dev/null and b/Screenshot.png differ