From 530734d159b5608c8ec5cadc24f2537df3b04f76 Mon Sep 17 00:00:00 2001
From: Samuel Walker <swalker@piwalker.net>
Date: Tue, 21 Jan 2025 22:03:15 -0700
Subject: [PATCH] prebuild spdlog, and fix some link warnings.

---
 2dGameProject/Log.h              | 2 +-
 2dGameProject/SpriteRenderer.cpp | 4 ++--
 CMakeLists.txt                   | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/2dGameProject/Log.h b/2dGameProject/Log.h
index 484b3ae..07a727d 100644
--- a/2dGameProject/Log.h
+++ b/2dGameProject/Log.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "spdlog/spdlog.h"
+#include "spdlog/logger.h"
 #include <memory>
 
 #define TRACE(...) Log::GetLogger()->trace(__VA_ARGS__)
diff --git a/2dGameProject/SpriteRenderer.cpp b/2dGameProject/SpriteRenderer.cpp
index 5698be0..3944d41 100644
--- a/2dGameProject/SpriteRenderer.cpp
+++ b/2dGameProject/SpriteRenderer.cpp
@@ -48,7 +48,7 @@ SpriteRenderer::SpriteRenderer() {
 	glVertexAttribDivisor(4, 1);
 	glVertexAttribDivisor(5, 1);
 
-	glBindVertexArray(NULL);
+	glBindVertexArray(0);
 	INFO("Sprite renderer initialized");
 
 }
@@ -68,7 +68,7 @@ void SpriteRenderer::flush() {
 	glBufferData(GL_ARRAY_BUFFER, sizeof(glm::mat4) * matrices.size(), matrices.data(), GL_STREAM_DRAW);
 	glBindVertexArray(VAO);
 	glDrawElementsInstanced(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0, matrices.size());
-	glBindVertexArray(NULL);
+	glBindVertexArray(0);
 	glFinish();
 	matrices.clear();
 }
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22afde5..aa6376f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ set(OpenGL_GL_PREFERENCE GLVND)
 find_package(OpenGL REQUIRED)
 add_subdirectory(deps/glfw)
 add_subdirectory(deps/glad)
+add_subdirectory(deps/spdlog)
 add_executable(2dGameProject ${2dGameProject_SRC})
 target_include_directories(2dGameProject PUBLIC
                           "${PROJECT_SOURCE_DIR}/deps/glfw/include"
@@ -16,4 +17,4 @@ target_include_directories(2dGameProject PUBLIC
                           "${PROJECT_SOURCE_DIR}/deps/spdlog/include"
                           )
 
-target_link_libraries(2dGameProject PUBLIC glfw glad ${OPENGL_LIBRARIES})
\ No newline at end of file
+target_link_libraries(2dGameProject PUBLIC glfw glad spdlog::spdlog ${OPENGL_LIBRARIES})
\ No newline at end of file