-- Add freeglut and glew64 libs for simpleGL

-- delete freeimage libs and headers, user needs to install it for building samples depending on it
NVIDIA · Dec 11, 2020 · b882fa0 · b882fa0
1 parent 1cd3264
commit b882fa0
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 1,300 deletions.
diff --git a/Common/FreeImage/freeimage-license.txt b/Common/FreeImage/freeimage-license.txt
diff --git a/Common/FreeImage/include/FreeImage.h b/Common/FreeImage/include/FreeImage.h
diff --git a/Common/FreeImage/lib/darwin/libfreeimage.a b/Common/FreeImage/lib/darwin/libfreeimage.a
diff --git a/Common/FreeImage/lib/linux/aarch64/libfreeimage-3.16.0.so b/Common/FreeImage/lib/linux/aarch64/libfreeimage-3.16.0.so
diff --git a/Common/FreeImage/lib/linux/aarch64/libfreeimage.a b/Common/FreeImage/lib/linux/aarch64/libfreeimage.a
diff --git a/Common/FreeImage/lib/linux/armv7l/libfreeimage.a b/Common/FreeImage/lib/linux/armv7l/libfreeimage.a
diff --git a/Common/FreeImage/lib/linux/ppc64le/libfreeimage.a b/Common/FreeImage/lib/linux/ppc64le/libfreeimage.a
diff --git a/Common/FreeImage/lib/linux/sbsa/libfreeimage.a b/Common/FreeImage/lib/linux/sbsa/libfreeimage.a
diff --git a/Common/FreeImage/lib/linux/x86_64/libfreeimage.a b/Common/FreeImage/lib/linux/x86_64/libfreeimage.a
diff --git a/Common/FreeImage/lib/x64/FreeImage.dll b/Common/FreeImage/lib/x64/FreeImage.dll
diff --git a/Common/FreeImage/lib/x64/FreeImage.lib b/Common/FreeImage/lib/x64/FreeImage.lib
diff --git a/Common/lib/x64/freeglut.lib b/Common/lib/x64/freeglut.lib
diff --git a/Common/lib/x64/glew64.lib b/Common/lib/x64/glew64.lib
diff --git a/README.md b/README.md
@@ -209,7 +209,7 @@ These third-party dependencies are required by some CUDA samples. If available,
 
 FreeImage is an open source imaging library. FreeImage can usually be installed on Linux using your distribution's package manager system. FreeImage can also be downloaded from the FreeImage website.
 
-To set up FreeImage on a Windows system, extract the FreeImage DLL distribution into the `7_CUDALibraries/common/` folder such that `7_CUDALibraries/common/FreeImage/Dist/x64/` contains the .h, .dll, and .lib files.
+To set up FreeImage on a Windows system, extract the FreeImage DLL distribution into the folder `../../Common/FreeImage/Dist/x64` such that it contains the .h, .dll, and .lib files.
 
 #### Message Passing Interface
 

diff --git a/Samples/simpleGL/simpleGL_vs2017.vcxproj b/Samples/simpleGL/simpleGL_vs2017.vcxproj
@@ -63,7 +63,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <AdditionalDependencies>cudart_static.lib;freeglut.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)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CudaToolkitLibDir);../../common/lib/$(PlatformName);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CudaToolkitLibDir);../../Common/lib/$(PlatformName);</AdditionalLibraryDirectories>
       <OutputFile>$(OutDir)/simpleGL.exe</OutputFile>
     </Link>
     <CudaCompile>
@@ -104,7 +104,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <Link>
-      <AdditionalDependencies>glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">

diff --git a/Samples/simpleGL/simpleGL_vs2019.vcxproj b/Samples/simpleGL/simpleGL_vs2019.vcxproj
@@ -59,7 +59,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <AdditionalDependencies>cudart_static.lib;freeglut.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)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CudaToolkitLibDir);../../common/lib/$(PlatformName);</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CudaToolkitLibDir);../../Common/lib/$(PlatformName);</AdditionalLibraryDirectories>
       <OutputFile>$(OutDir)/simpleGL.exe</OutputFile>
     </Link>
     <CudaCompile>
@@ -100,7 +100,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <Link>
-      <AdditionalDependencies>glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">

diff --git a/bin/win64/Debug/freeglut.dll b/bin/win64/Debug/freeglut.dll
diff --git a/bin/win64/Debug/glew64.dll b/bin/win64/Debug/glew64.dll
diff --git a/bin/win64/Release/freeglut.dll b/bin/win64/Release/freeglut.dll
diff --git a/bin/win64/Release/glew64.dll b/bin/win64/Release/glew64.dll