diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d2314110fd2d..e5e0f3e136c09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,6 +405,9 @@ add_subdirectory (io) add_subdirectory (net) add_subdirectory (builtins/mathtext) # hard coded builtin for graf2d add_subdirectory (graf2d) +if (opengl) + add_subdirectory (builtins/glad) # hard coded builtin for graf3d +endif() add_subdirectory (graf3d) if(NOT minimal) add_subdirectory (gui) diff --git a/graf3d/glad/CMakeLists.txt b/builtins/glad/CMakeLists.txt similarity index 100% rename from graf3d/glad/CMakeLists.txt rename to builtins/glad/CMakeLists.txt diff --git a/graf3d/glad/inc/KHR/khrplatform.h b/builtins/glad/inc/KHR/khrplatform.h similarity index 100% rename from graf3d/glad/inc/KHR/khrplatform.h rename to builtins/glad/inc/KHR/khrplatform.h diff --git a/graf3d/glad/inc/TGLIncludes.h b/builtins/glad/inc/TGLIncludes.h similarity index 100% rename from graf3d/glad/inc/TGLIncludes.h rename to builtins/glad/inc/TGLIncludes.h diff --git a/graf3d/glad/inc/glad/gl.h b/builtins/glad/inc/glad/gl.h similarity index 100% rename from graf3d/glad/inc/glad/gl.h rename to builtins/glad/inc/glad/gl.h diff --git a/graf3d/glad/inc/glad/glx.h b/builtins/glad/inc/glad/glx.h similarity index 100% rename from graf3d/glad/inc/glad/glx.h rename to builtins/glad/inc/glad/glx.h diff --git a/graf3d/glad/inc/glad/wgl.h b/builtins/glad/inc/glad/wgl.h similarity index 100% rename from graf3d/glad/inc/glad/wgl.h rename to builtins/glad/inc/glad/wgl.h diff --git a/graf3d/glad/src/gl.c b/builtins/glad/src/gl.c similarity index 100% rename from graf3d/glad/src/gl.c rename to builtins/glad/src/gl.c diff --git a/graf3d/glad/src/glx.c b/builtins/glad/src/glx.c similarity index 100% rename from graf3d/glad/src/glx.c rename to builtins/glad/src/glx.c diff --git a/graf3d/glad/src/wgl.c b/builtins/glad/src/wgl.c similarity index 100% rename from graf3d/glad/src/wgl.c rename to builtins/glad/src/wgl.c diff --git a/graf3d/CMakeLists.txt b/graf3d/CMakeLists.txt index a3dbf992200d3..4e3dc90115980 100644 --- a/graf3d/CMakeLists.txt +++ b/graf3d/CMakeLists.txt @@ -17,7 +17,6 @@ if (opengl) add_subdirectory(gviz3d) endif() add_subdirectory(gl) - add_subdirectory(glad) endif() if(webgui AND root7 AND geom)