diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-11-23 18:12:33 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-11-23 18:12:33 +0100 |
| commit | b6c5de7c05c3a76849331c1f163dabd6c41e3a82 (patch) | |
| tree | e3090d5efdce7ddc02539aabff396a893b688149 /src | |
| parent | 27a6fd9609c08b60057b0482a835dc27a64a0786 (diff) | |
Restore build with HAVE_GL = 1 and HAVE_GL_GLU_H = 0
Diffstat (limited to 'src')
| -rw-r--r-- | src/gl_draw.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
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 <FL/math.h> // for ceil() #include "Fl_Gl_Window_Driver.H" #include <FL/Fl_Image_Surface.H> -#include <FL/glu.h> // for gluUnProject() +#if HAVE_GL_GLU_H +# include <FL/glu.h> // for gluUnProject() +#endif #include <FL/glut.H> // for glutStrokeString() and glutStrokeLength() #include <stdlib.h> @@ -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 } /** |