Fix glad build, sort of

Author: petterarvidsson

CMakeLists.txt

@@ -50,7 +50,7 @@ find_package(ZLIB REQUIRED)
 include_directories(
   dependencies/nanogui/include
   dependencies/nanogui/ext/glfw/include
-  dependencies/nanogui/ext/glew/include
+  dependencies/nanogui/ext/glad/include
   dependencies/nanogui/ext/eigen
   dependencies/nanogui/ext/nanovg/src
   dependencies/optional-lite
@@ -59,15 +59,17 @@ include_directories(
 
 FILE(
   GLOB SOURCE_FILES
-  src/*.cpp)
+  src/*.cpp
+  dependencies/nanogui/ext/glad/src/glad.c
+  )
 
 add_executable(konstructs ${SOURCE_FILES})
 
 set(konstructs_LIBS
     konstructs-lib
     ${ZLIB_LIBRARIES}
     nanogui ${NANOGUI_EXTRA_LIBS}
-	glfw
+    glfw
 )
 
 if(WIN32 OR MINGW)

lib/CMakeLists.txt

@@ -29,7 +29,7 @@ find_package(ZLIB REQUIRED)
 include_directories(
   ${ZLIB_INCLUDE_DIRS}
   ../dependencies/nanogui/ext/glfw/include
-  ../dependencies/nanogui/ext/glew/include
+  ../dependencies/nanogui/ext/glad/include
   ../dependencies/nanogui/ext/eigen
   ../dependencies/lodepng
   ../dependencies/optional-lite

lib/include/gl_includes.h

@@ -4,8 +4,8 @@
 #if defined(__APPLE__)
     #define GLFW_INCLUDE_GLCOREARB
 #elif defined(WIN32)
-    #define GLEW_STATIC
-    #include <GL/glew.h>
+    #include <windows.h>
+    #include <glad/glad.h>
 #else
     #define GL_GLEXT_PROTOTYPES
 #endif

src/main.cpp

@@ -1,19 +1,3 @@
-#if defined(NANOGUI_GLAD)
-    #if defined(NANOGUI_SHARED) && !defined(GLAD_GLAPI_EXPORT)
-        #define GLAD_GLAPI_EXPORT
-    #endif
-
-    #include <glad/glad.h>
-#else
-    #if defined(__APPLE__)
-        #define GLFW_INCLUDE_GLCOREARB
-    #else
-        #define GL_GLEXT_PROTOTYPES
-    #endif
-#endif
-
-#include <GLFW/glfw3.h>
-
 #include <nanogui/nanogui.h>
 
 #if defined(WIN32)