Niceify opengl32 linkage on Windows

NVlabs · Feb 22, 2022 · 26a85a2 · 26a85a2
1 parent 5dfe126
commit 26a85a2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,7 +122,7 @@ if (NGP_BUILD_WITH_GUI)
 		include_directories("dependencies/gl3w")
 		link_directories("dependencies")
 		set(GL_SOURCES "dependencies/gl3w/GL/gl3w.c")
-		set(GL_LIBRARIES $<TARGET_OBJECTS:glfw_objects>)
+		set(GL_LIBRARIES opengl32 $<TARGET_OBJECTS:glfw_objects>)
 	else()
 		find_package(GLEW REQUIRED)
 		include_directories(${GLEW_INCLUDE_DIRS})

diff --git a/src/testbed.cu b/src/testbed.cu
@@ -49,14 +49,6 @@
 #    include <GL/glew.h>
 #  endif
 #  include <GLFW/glfw3.h>
-#  if defined(_MSC_VER)
-#    pragma comment(lib, "opengl32.lib")
-#    pragma comment(lib, "gdi32.lib")
-#    pragma comment(lib, "shell32.lib")
-#  endif
-#  if defined(_MSC_VER) && (_MSC_VER >= 1900) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
-#    pragma comment(lib, "legacy_stdio_definitions")
-#  endif
 #endif
 
 #undef min