From 9dcdcf68f6a60741cbdd287e7eda23b4a21a080e Mon Sep 17 00:00:00 2001
From: rtk0c <mail.tianyig@gmail.com>
Date: Sat, 19 Feb 2022 13:30:03 -0800
Subject: Fix build errors and update all dependencies to latest version -
 Fixed doctest executable not compiling - Fixed class accessibility error in
 Workflow_Main.cpp - Fixed selection of OpenGL loader in imgui OpenGL 2 & 3
 backends   - All loading is handled in our code now, the imgui_*_backend.cpp
 files are instructed to do nothing

---
 core/src/Entrypoint/Backend_OpenGL2.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core/src/Entrypoint/Backend_OpenGL2.cpp')

diff --git a/core/src/Entrypoint/Backend_OpenGL2.cpp b/core/src/Entrypoint/Backend_OpenGL2.cpp
index 8c56b81..8f80094 100644
--- a/core/src/Entrypoint/Backend_OpenGL2.cpp
+++ b/core/src/Entrypoint/Backend_OpenGL2.cpp
@@ -2,6 +2,7 @@
 
 #if BUILD_CORE_WITH_OPENGL2_BACKEND
 #	include <glad/glad.h>
+
 #	include <GLFW/glfw3.h>
 #	include <backend/imgui_impl_glfw.h>
 #	include <backend/imgui_impl_opengl2.h>
@@ -9,7 +10,7 @@
 #	include <stdexcept>
 #	include <iostream>
 
-#	define IMGUI_IMPL_OPENGL_LOADER_GLAD
+#	define IMGUI_IMPL_OPENGL_LOADER_CUSTOM
 #	include <backend/imgui_impl_opengl2.cpp>
 
 class OpenGL2Backend : public RenderingBackend
@@ -97,7 +98,7 @@ std::unique_ptr<RenderingBackend> RenderingBackend::CreateOpenGL2Backend()
 
 #else // ^^ BUILD_CORE_WITH_OPENGL2_BACKEND | !BUILD_CORE_WITH_OPENGL2_BACKEND vv
 
-std::unique_ptr<RenderingBackend> RenderingBackend::CreateOpenGL2Backend(){}()
+std::unique_ptr<RenderingBackend> RenderingBackend::CreateOpenGL2Backend()
 {
 	return nullptr;
 }
-- 
cgit v1.2.3-70-g09d2