Cleanup.

nuno-tiago-reis · Feb 12, 2018 · f9d4f43 · f9d4f43
1 parent 5fa9e20
commit f9d4f43
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 278 deletions.
diff --git a/.gitignore b/.gitignore
@@ -73,4 +73,6 @@ packages/
 debug
 /output/*.exe
 /output/*.pdb
-/projects/CUDA-Engine/output.txt
+/projects/CUDA-Engine/*.pdb
+/projects/CUDA-Naive-Engine/*.pdb
+/projects/CUDA-Naive-Ray-Tracer/*.pdb
diff --git a/projects/CUDA-Engine/vc100.pdb b/projects/CUDA-Engine/vc100.pdb
diff --git a/projects/CUDA-Engine/vc120.pdb b/projects/CUDA-Engine/vc120.pdb
diff --git a/projects/CUDA-Naive-Engine/backup.txt b/projects/CUDA-Naive-Engine/backup.txt
diff --git a/projects/CUDA-Naive-Engine/output.txt b/projects/CUDA-Naive-Engine/output.txt
diff --git a/projects/CUDA-Naive-Engine/vc100.pdb b/projects/CUDA-Naive-Engine/vc100.pdb
diff --git a/projects/CUDA-Naive-Ray-Tracer/Activity.nvact b/projects/CUDA-Naive-Ray-Tracer/Activity.nvact
diff --git a/projects/CUDA-Naive-Ray-Tracer/CUDA Naive Ray Tracer.vcxproj b/projects/CUDA-Naive-Ray-Tracer/CUDA Naive Ray Tracer.vcxproj
@@ -114,8 +114,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)output\</OutDir>
-    <IncludePath>$(SolutionDir)\dependencies\soil\include;$(SolutionDir)\dependencies\cuda\include;$(SolutionDir)\dependencies\glew\include;$(SolutionDir)\dependencies\freeglut\include;$(SolutionDir)\dependencies\freeimage\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\dependencies\soil\lib;$(SolutionDir)\dependencies\glew\lib;$(SolutionDir)\dependencies\freeglut\lib;$(SolutionDir)\dependencies\freeimage\lib;$(SolutionDir)\dependencies\cuda\lib\Win32;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)\dependencies\soil\include;$(SolutionDir)\dependencies\cuda\include;$(SolutionDir)\dependencies\glew\include;$(SolutionDir)\dependencies\freeglut\include;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\dependencies\soil\lib;$(SolutionDir)\dependencies\glew\lib;$(SolutionDir)\dependencies\freeglut\lib;$(SolutionDir)\dependencies\cuda\lib\Win32;$(LibraryPath)</LibraryPath>
     <SourcePath>$(ProjectDir)\source</SourcePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|Win32'">
@@ -165,7 +165,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>freeglut.lib;freeimage.lib;glew32.lib;cudart.lib;cuda.lib;soil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>freeglut.lib;glew32.lib;cudart.lib;cuda.lib;soil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CudaCompile>
       <HostDebugInfo>false</HostDebugInfo>

diff --git a/projects/CUDA-Naive-Ray-Tracer/vc100.pdb b/projects/CUDA-Naive-Ray-Tracer/vc100.pdb