From 890e108caecd9f6e076adfa7813d4b12833b40ef Mon Sep 17 00:00:00 2001 From: OLEGSHA Date: Thu, 1 Apr 2021 22:04:19 +0300 Subject: [PATCH] Moved GLAD and STB into libs/ subdirectory --- CMakeLists.txt | 8 ++++---- {glad => libs/glad}/include/KHR/khrplatform.h | 0 {glad => libs/glad}/include/glad/gl.h | 0 {glad => libs/glad}/src/gl.c | 0 {stb => libs/stb}/include/stb/stb_image.h | 0 {stb => libs/stb}/src/stb_image.c | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename {glad => libs/glad}/include/KHR/khrplatform.h (100%) rename {glad => libs/glad}/include/glad/gl.h (100%) rename {glad => libs/glad}/src/gl.c (100%) rename {stb => libs/stb}/include/stb/stb_image.h (100%) rename {stb => libs/stb}/src/stb_image.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e15789b..651b198 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ project(progressiatexturepreviewer) add_executable(progressiatexturepreviewer main.cpp - glad/src/gl.c - stb/src/stb_image.c + libs/glad/src/gl.c + libs/stb/src/stb_image.c ) install(TARGETS progressiatexturepreviewer RUNTIME DESTINATION bin) @@ -25,7 +25,7 @@ find_package(glm REQUIRED) target_link_libraries(progressiatexturepreviewer glm) # Use GLAD -target_include_directories(progressiatexturepreviewer PRIVATE glad/include) +target_include_directories(progressiatexturepreviewer PRIVATE libs/glad/include) # Use STB Image -target_include_directories(progressiatexturepreviewer PRIVATE stb/include) +target_include_directories(progressiatexturepreviewer PRIVATE libs/stb/include) diff --git a/glad/include/KHR/khrplatform.h b/libs/glad/include/KHR/khrplatform.h similarity index 100% rename from glad/include/KHR/khrplatform.h rename to libs/glad/include/KHR/khrplatform.h diff --git a/glad/include/glad/gl.h b/libs/glad/include/glad/gl.h similarity index 100% rename from glad/include/glad/gl.h rename to libs/glad/include/glad/gl.h diff --git a/glad/src/gl.c b/libs/glad/src/gl.c similarity index 100% rename from glad/src/gl.c rename to libs/glad/src/gl.c diff --git a/stb/include/stb/stb_image.h b/libs/stb/include/stb/stb_image.h similarity index 100% rename from stb/include/stb/stb_image.h rename to libs/stb/include/stb/stb_image.h diff --git a/stb/src/stb_image.c b/libs/stb/src/stb_image.c similarity index 100% rename from stb/src/stb_image.c rename to libs/stb/src/stb_image.c