From c60c02555476c78c5c50bd850529e6be0d8ecc41 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Apr 2018 16:30:34 +0200 Subject: [PATCH] - moved gl_load headers out of the gl folder. This is mainly to get them out of the way. The place is not optimal but will have to do as long as this remains a separate branch. --- src/CMakeLists.txt | 4 +++- src/{gl/system => gl_load}/gl_extlist.txt | 0 src/{gl/system => gl_load}/gl_load.c | 0 src/{gl/system => gl_load}/gl_load.h | 0 4 files changed, 3 insertions(+), 1 deletion(-) rename src/{gl/system => gl_load}/gl_extlist.txt (100%) rename src/{gl/system => gl_load}/gl_load.c (100%) rename src/{gl/system => gl_load}/gl_load.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 152d60b53..564e019cf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -727,6 +727,7 @@ file( GLOB HEADER_FILES gl/system/*.h gl/textures/*.h gl/utility/*.h + gl_load/*.h *.h ) @@ -857,7 +858,7 @@ set( FASTMATH_SOURCES gl/scene/gl_vertex.cpp gl/scene/gl_spritelight.cpp gl/dynlights/gl_dynlight1.cpp - gl/system/gl_load.c + gl_load/gl_load.c gl/models/gl_models.cpp r_data/models/models.cpp r_data/matrix.cpp @@ -1411,6 +1412,7 @@ source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fr source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+") source_group("Inventory" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_inventory/.+") source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+") +source_group("OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl_load/.+") source_group("OpenGL Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/.+") source_group("OpenGL Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/data/.+") source_group("OpenGL Renderer\\Dynamic Lights" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/dynlights/.+") diff --git a/src/gl/system/gl_extlist.txt b/src/gl_load/gl_extlist.txt similarity index 100% rename from src/gl/system/gl_extlist.txt rename to src/gl_load/gl_extlist.txt diff --git a/src/gl/system/gl_load.c b/src/gl_load/gl_load.c similarity index 100% rename from src/gl/system/gl_load.c rename to src/gl_load/gl_load.c diff --git a/src/gl/system/gl_load.h b/src/gl_load/gl_load.h similarity index 100% rename from src/gl/system/gl_load.h rename to src/gl_load/gl_load.h