FLTK logo

[master] b6c5de7 - Restore build with HAVE_GL = 1 and HAVE_GL_GLU_H = 0

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] b6c5de7 - Restore build with HAVE_GL = 1 and HAVE_GL_GLU_H = 0 "ManoloFLTK" Nov 23, 2022  
 
commit b6c5de7c05c3a76849331c1f163dabd6c41e3a82
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Wed Nov 23 18:12:33 2022 +0100
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Wed Nov 23 18:12:33 2022 +0100

    Restore build with HAVE_GL = 1 and HAVE_GL_GLU_H = 0

 src/gl_draw.cxx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git src/gl_draw.cxx src/gl_draw.cxx
index b786b83..16a70a0 100644
--- src/gl_draw.cxx
+++ 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
 }
 
 /**
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.