From 56e10892c72c9bec828dd950feb2f00f0238c5e0 Mon Sep 17 00:00:00 2001
From: Samuel Walker <swalker@piwalker.net>
Date: Tue, 21 Jan 2025 12:05:41 -0700
Subject: [PATCH] Migrated to cmake.

---
 .gitignore               |  4 +++-
 2dGameProject/main.cpp   |  4 +---
 CMakeLists.txt           | 18 ++++++++++++++++++
 deps/glad/CMakeLists.txt |  6 ++++++
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 CMakeLists.txt
 create mode 100644 deps/glad/CMakeLists.txt

diff --git a/.gitignore b/.gitignore
index 028f5ad..f2ad381 100644
--- a/.gitignore
+++ b/.gitignore
@@ -362,4 +362,6 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
-log.txt
\ No newline at end of file
+log.txt
+
+build/
\ No newline at end of file
diff --git a/2dGameProject/main.cpp b/2dGameProject/main.cpp
index 45a192c..5ad6057 100644
--- a/2dGameProject/main.cpp
+++ b/2dGameProject/main.cpp
@@ -68,7 +68,6 @@ unsigned int shaderProgram;
 void GLAPIENTRY MessageCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userparam) {
 	if (type == GL_DEBUG_TYPE_ERROR) {
 		ERR("GL CALLBACK: ** GL ERROR ** type = {}, severity = {}, message = {}", type, severity, message);
-		__debugbreak();
 	} else {
 		DEBUG("GL CALLBACK: type = {}, severity = {}, message = {}", type, severity, message);
 	}
@@ -83,7 +82,7 @@ void openGLContextInit() {
 	INFO("GLAD Initialized");
 	int flags; glGetIntegerv(GL_CONTEXT_FLAGS, &flags);
 	if (!(flags & GL_CONTEXT_FLAG_DEBUG_BIT)){
-		ERROR("Failed to create Debug Context");
+		ERR("Failed to create Debug Context");
 	}
 	glEnable(GL_DEBUG_OUTPUT);
 	glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
@@ -209,7 +208,6 @@ int main() {
 	init();
 
 	std::thread renderThread(render);
-	Sleep(10);
 	update();
 	renderThread.join();
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..92d6900
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.10)
+project(2dGameProject)
+file(GLOB 2dGameProject_SRC
+     "2dGameProject/*.h"
+     "2dGameProject/*.cpp"
+)
+find_package(OpenGL REQUIRED)
+add_subdirectory(deps/glfw)
+add_subdirectory(deps/glad)
+add_executable(2dGameProject ${2dGameProject_SRC})
+target_include_directories(2dGameProject PUBLIC
+                          "${PROJECT_SOURCE_DIR}/deps/glfw/include"
+                          "${PROJECT_SOURCE_DIR}/deps/glad/include"
+                          "${PROJECT_SOURCE_DIR}/deps/glm"
+                          "${PROJECT_SOURCE_DIR}/deps/spdlog/include"
+                          )
+
+target_link_libraries(2dGameProject PUBLIC glfw glad ${OPENGL_LIBRARIES})
\ No newline at end of file
diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt
new file mode 100644
index 0000000..34a1cd4
--- /dev/null
+++ b/deps/glad/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.10)
+project(glad)
+add_library(glad src/glad.c)
+target_include_directories(glad PUBLIC
+                          "${PROJECT_SOURCE_DIR}/include"
+                          )
\ No newline at end of file