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_OpenGL3.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/core/src/Entrypoint/Backend_OpenGL3.cpp b/core/src/Entrypoint/Backend_OpenGL3.cpp
index b4ae368..96a260a 100644
--- a/core/src/Entrypoint/Backend_OpenGL3.cpp
+++ b/core/src/Entrypoint/Backend_OpenGL3.cpp
@@ -2,6 +2,7 @@
 
 #if BUILD_CORE_WITH_OPENGL3_BACKEND
 #	include <glad/glad.h>
+
 #	include <GLFW/glfw3.h>
 #	include <iostream>
 #	include <backend/imgui_impl_glfw.h>
@@ -9,7 +10,7 @@
 #	include <imgui.h>
 #	include <stdexcept>
 
-#	define IMGUI_IMPL_OPENGL_LOADER_GLAD
+#	define IMGUI_IMPL_OPENGL_LOADER_CUSTOM
 #	include <backend/imgui_impl_opengl3.cpp>
 
 class OpenGL3Backend : public RenderingBackend
@@ -37,8 +38,8 @@ public:
 		const char* glslVersion = "#version 130";
 		glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
 		glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
-		//glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);  // 3.2+ only
-		//glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);            // 3.0+ only
+		// glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);  // 3.2+ only
+		// glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);            // 3.0+ only
 #	endif
 
 		mWindow = glfwCreateWindow(1280, 720, "Cplt", nullptr, nullptr);
-- 
cgit v1.2.3-70-g09d2