glad: implement Windows fixes suggested by Bertrand

Author: guitargeek

graf3d/eve/CMakeLists.txt

@@ -238,6 +238,7 @@ if(MSVC)
       RGL
       Physics
   )
+  target_compile_definitions(Eve PRIVATE GLAD_API_CALL_EXPORT)
 
   ROOT_GENERATE_DICTIONARY(G__Eve2
     ${EVE_HEADERS2}

graf3d/ftgl/CMakeLists.txt

@@ -44,6 +44,9 @@ ROOT_LINKER_LIBRARY(FTGL
   BUILTINS
     FREETYPE
 )
+if(MSVC)
+  target_compile_definitions(FTGL PRIVATE GLAD_API_CALL_EXPORT)
+endif()
 
 target_include_directories(FTGL PRIVATE
       ${FREETYPE_INCLUDE_DIRS}

graf3d/gl/CMakeLists.txt

@@ -220,6 +220,9 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL
   INSTALL_OPTIONS
     ${installoptions}
 )
+if(MSVC)
+  target_compile_definitions(RGL PRIVATE GLAD_API_CALL_EXPORT)
+endif()
 
 target_include_directories(RGL PRIVATE
      ${OPENGL_INCLUDE_DIR}

graf3d/gl/src/TGLWidget.cxx

@@ -383,7 +383,7 @@ void TGLWidget::SetFormat()
    static bool wgl_init = false;
    if ( ! wgl_init) {
       wgl_init = true;
-      int status = gladLoaderLoadWGL(HDC);
+      int status = gladLoaderLoadWGL(hDC);
       printf("GLAD loader WGL version %d.%d\n", GLAD_VERSION_MAJOR(status), GLAD_VERSION_MINOR(status));
    }
 

graf3d/rglew/CMakeLists.txt

@@ -24,9 +24,13 @@ endif()
 
 if(MSVC)
   list(APPEND rglew_srcs src/wgl.c)
+  list(APPEND rglew_libs OpenGL32.lib)
 endif()
 
 ROOT_LINKER_LIBRARY(RGlew ${rglew_srcs} LIBRARIES ${rglew_libs})
+if(MSVC)
+  target_compile_definitions(RGlew PRIVATE GLAD_API_CALL_EXPORT GLAD_API_CALL_EXPORT_BUILD)
+endif()
 
 # We still need to install TGLIncludes.h into include/
 ROOT_INSTALL_HEADERS()