From bbc6c85e57e84c3fb2a870e2b39171354233d856 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Sat, 20 Aug 2022 10:47:13 +0100
Subject: [PATCH] header_only was really glad, fix name
---
CMakeLists.txt | 2 +-
demo/CMakeLists.txt | 3 ++-
vendor/{header_only => glad}/CMakeLists.txt | 0
vendor/{header_only => glad}/public/KHR/khrplatform.h | 0
vendor/{header_only => glad}/public/PerlinNoise.hpp | 0
vendor/{header_only => glad}/public/glad/glad.h | 0
6 files changed, 3 insertions(+), 2 deletions(-)
rename vendor/{header_only => glad}/CMakeLists.txt (100%)
rename vendor/{header_only => glad}/public/KHR/khrplatform.h (100%)
rename vendor/{header_only => glad}/public/PerlinNoise.hpp (100%)
rename vendor/{header_only => glad}/public/glad/glad.h (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 378a029..b5a980e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# vendor dependencies
add_subdirectory( vendor/imgui )
-add_subdirectory( vendor/header_only )
+add_subdirectory(vendor/glad)
# engine headers
file(GLOB_RECURSE public_headers
diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
index 71a00aa..83349bf 100644
--- a/demo/CMakeLists.txt
+++ b/demo/CMakeLists.txt
@@ -15,7 +15,8 @@ target_include_directories(demo
${CMAKE_CURRENT_SOURCE_DIR}/include
)
-target_link_libraries(demo fggl fgglbt)
+target_link_libraries( demo fggl )
+#target_link_libraries(demo fggl fgglbt)
find_package(spdlog)
target_link_libraries(demo spdlog::spdlog)
diff --git a/vendor/header_only/CMakeLists.txt b/vendor/glad/CMakeLists.txt
similarity index 100%
rename from vendor/header_only/CMakeLists.txt
rename to vendor/glad/CMakeLists.txt
diff --git a/vendor/header_only/public/KHR/khrplatform.h b/vendor/glad/public/KHR/khrplatform.h
similarity index 100%
rename from vendor/header_only/public/KHR/khrplatform.h
rename to vendor/glad/public/KHR/khrplatform.h
diff --git a/vendor/header_only/public/PerlinNoise.hpp b/vendor/glad/public/PerlinNoise.hpp
similarity index 100%
rename from vendor/header_only/public/PerlinNoise.hpp
rename to vendor/glad/public/PerlinNoise.hpp
diff --git a/vendor/header_only/public/glad/glad.h b/vendor/glad/public/glad/glad.h
similarity index 100%
rename from vendor/header_only/public/glad/glad.h
rename to vendor/glad/public/glad/glad.h
--
GitLab