diff --git a/.gitignore b/.gitignore index 7b85873..4c810a9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ # Visual Studio Stuff *.suo +*.sdf # Mac Stuff *.DS_Store \ No newline at end of file diff --git a/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj b/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj index d04d1a7..e613ae1 100644 --- a/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj +++ b/PROJ0_WIN/CUDATEST/CUDATEST.vcxproj @@ -42,7 +42,7 @@ - + @@ -64,12 +64,12 @@ 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:\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 - ../shared/glew/lib;../shared/freeglut/lib;%(AdditionalLibraryDirectories) + ..\shared\glew\lib;..\shared\freeglut\lib;%(AdditionalLibraryDirectories) 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 @@ -77,7 +77,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;C:/ProgramData/NVIDIA Corporation/CUDA Samples/v5.5/common/inc;..\shared\glew\include;..\shared\freeglut\include @@ -107,6 +107,6 @@ - + \ No newline at end of file diff --git a/PROJ0_WIN/CUDATEST/main.cpp b/PROJ0_WIN/CUDATEST/main.cpp index dbb520b..79faeb3 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 = "Takashi Furuya"; init(argc, argv); initVAO(); diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..9ce4159 Binary files /dev/null and b/screenshot.png differ