From b6c5de7c05c3a76849331c1f163dabd6c41e3a82 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Wed, 23 Nov 2022 18:12:33 +0100 Subject: Restore build with HAVE_GL = 1 and HAVE_GL_GLU_H = 0 --- src/gl_draw.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index b786b830d..16a70a057 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -40,7 +40,9 @@ #include // for ceil() #include "Fl_Gl_Window_Driver.H" #include -#include // for gluUnProject() +#if HAVE_GL_GLU_H +# include // for gluUnProject() +#endif #include // for glutStrokeString() and glutStrokeLength() #include @@ -378,7 +380,7 @@ void gl_texture_fifo::display_texture(int rank) glMatrixMode (GL_PROJECTION); glPopMatrix(); glMatrixMode (matrixMode); - +#if HAVE_GL_GLU_H //set the raster position to end of string pos[0] += width; GLdouble modelmat[16]; @@ -395,6 +397,7 @@ void gl_texture_fifo::display_texture(int rank) objY *= gl_start_scale; } glRasterPos2d(objX, objY); +#endif // HAVE_GL_GLU_H } // display_texture @@ -626,6 +629,7 @@ void Fl_Gl_Window_Driver::draw_string_legacy_glut(const char* str, int n) glMatrixMode (GL_PROJECTION); glPopMatrix(); glMatrixMode (matrixMode); +#if HAVE_GL_GLU_H //set the raster position to end of string pos[0] += width; GLdouble modelmat[16]; @@ -641,6 +645,7 @@ void Fl_Gl_Window_Driver::draw_string_legacy_glut(const char* str, int n) objY *= gl_start_scale; } glRasterPos2d(objX, objY); +#endif // HAVE_GL_GLU_H } /** -- cgit v1.2.3