Skip to content

Commit 9a8fe9f

Browse files
committed
Delete deprecated TGLIncludes.h public header
Delete a deprecated header that was kept for backwards compatibility, and mention the removal of GLEW headers done in f7eda99 in the release notes.
1 parent 01f0191 commit 9a8fe9f

File tree

10 files changed

+18
-52
lines changed

10 files changed

+18
-52
lines changed

README/ReleaseNotes/v640/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ The following people have contributed to this new version:
3636

3737
* The `TObject` equality operator pythonization (`TObject.__eq__`) that was deprecated in ROOT 6.38 and scheduled for removal in ROOT 6.40 is removed
3838
* Comparing C++ `nullptr` objects with `None` in Python now raises a `TypeError`, as announced in the ROOT 6.38 release notes. Use truth-value checks like `if not x` or `x is None` instead.
39+
* The `TGLIncludes.h` and `TGLWSIncludes.h` that were deprecated in ROOT 6.38 and scheduled for removal are gone now. Please include your required headers like `<GL/gl.h>` or `<GL/glu.h>` directly.
40+
* The GLEW headers (`GL/eglew.h`, `GL/glew.h`, `GL/glxew.h`, and `GL/wglew.h`) that were installed when building ROOT with `builtin_glew=ON` are no longer installed. This is done because ROOT is moving away from GLEW for loading OpenGL extensions.
3941

4042
## Build System
4143

graf3d/eve/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ if(MSVC)
229229
OpenGL::GL
230230
OpenGL::GLU
231231
${FTGL_LIBRARIES}
232-
RGlew
232+
GLEW::GLEW
233233
DEPENDENCIES
234234
Core
235235
EG
@@ -264,7 +264,7 @@ else()
264264
OpenGL::GL
265265
OpenGL::GLU
266266
${FTGL_LIBRARIES}
267-
RGlew
267+
GLEW::GLEW
268268
DEPENDENCIES
269269
Core
270270
EG

graf3d/eve/src/TGLIncludes.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#ifdef WIN32
2+
#include "Windows4Root.h"
3+
#endif
4+
5+
#include <GL/glew.h>

graf3d/ftgl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ROOT_LINKER_LIBRARY(FTGL
4040
OpenGL::GLU
4141
${FREETYPE_LIBRARIES}
4242
ZLIB::ZLIB
43-
RGlew
43+
GLEW::GLEW
4444
BUILTINS
4545
FREETYPE
4646
)

graf3d/gl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL
210210
${FTGL_LIBRARIES}
211211
${GL2PS_LIBRARIES}
212212
${X11_LIBRARIES}
213-
RGlew
213+
GLEW::GLEW
214214
DEPENDENCIES
215215
Hist
216216
Gui

graf3d/gl/src/TGLIncludes.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#ifdef WIN32
2+
#include "Windows4Root.h"
3+
#endif
4+
5+
#include <GL/glew.h>

graf3d/gl/src/TPointSet3DGL.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include <TGLRnrCtx.h>
2020
#include <TGLSelectRecord.h>
21-
#include <TGLIncludes.h>
21+
#include "TGLIncludes.h"
2222

2323
/** \class TPointSet3DGL
2424
\ingroup opengl

graf3d/gl/src/gl2ps/gl2ps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <cstdio>
3939
#include <cstdlib>
4040

41-
#include <TGLIncludes.h>
41+
#include "../TGLIncludes.h"
4242

4343
#define GL2PSDLL_API
4444

graf3d/rglew/CMakeLists.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

graf3d/rglew/inc/TGLIncludes.h

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)