Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 23:42:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Separate test for GLU and GL...

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1449 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2001-04-30 17:17:01 +00:00
parent f2d2d347e9
commit 09f987eeb1
6 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configh.in
+11 -2
View File
@@ -1,5 +1,5 @@
/* /*
* "$Id: configh.in,v 1.11.2.10 2001/04/27 17:00:23 easysw Exp $" * "$Id: configh.in,v 1.11.2.11 2001/04/30 17:17:01 easysw Exp $"
* *
* Configuration file for the Fast Light Tool Kit (FLTK). * Configuration file for the Fast Light Tool Kit (FLTK).
* @configure_input@ * @configure_input@
@@ -49,6 +49,15 @@
#define HAVE_GL 0 #define HAVE_GL 0
/*
* HAVE_GL_GLU_H:
*
* Do you have the OpenGL Utility Library header file?
* (many broken Mesa RPMs do not...)
*/
#undef HAVE_GL_GLU_H
/* /*
* USE_COLORMAP: * USE_COLORMAP:
* *
@@ -168,5 +177,5 @@
#define USE_POLL 0 #define USE_POLL 0
/* /*
* End of "$Id: configh.in,v 1.11.2.10 2001/04/27 17:00:23 easysw Exp $". * End of "$Id: configh.in,v 1.11.2.11 2001/04/30 17:17:01 easysw Exp $".
*/ */
configure.in
+13 -4
View File
@@ -1,7 +1,7 @@
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl dnl
dnl "$Id: configure.in,v 1.33.2.29 2001/04/27 17:00:23 easysw Exp $" dnl "$Id: configure.in,v 1.33.2.30 2001/04/30 17:17:01 easysw Exp $"
dnl dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
@@ -179,11 +179,20 @@ GLLIB=
if test x$enable_gl != xno; then if test x$enable_gl != xno; then
AC_CHECK_HEADER(GL/gl.h, AC_CHECK_HEADER(GL/gl.h,
AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lGLU -lGL", \ AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB="-lGL", \
AC_CHECK_LIB(MesaGL,glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGLU -lMesaGL",,\ AC_CHECK_LIB(MesaGL,glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGL",,\
-lX11 -lXext $X_EXTRA_LIBS -lm), \ -lX11 -lXext $X_EXTRA_LIBS -lm), \
-lX11 -lXext $X_EXTRA_LIBS -lm) -lX11 -lXext $X_EXTRA_LIBS -lm)
) )
AC_CHECK_HEADER(GL/glu.h,
AC_DEFINE(HAVE_GL_GLU_H)
if test $ac_cv_lib_GL_glXMakeCurrent = yes; then
GLLIB="-lGLU $GLLIB"
fi
if test $ac_cv_lib_MesaGL_glXMakeCurrent = yes; then
GLLIB="-lMesaGLU $GLLIB"
fi
)
fi fi
AC_SUBST(GLLIB) AC_SUBST(GLLIB)
@@ -372,5 +381,5 @@ AC_CONFIG_HEADER(config.h:configh.in)
AC_OUTPUT(makeinclude) AC_OUTPUT(makeinclude)
dnl dnl
dnl End of "$Id: configure.in,v 1.33.2.29 2001/04/27 17:00:23 easysw Exp $". dnl End of "$Id: configure.in,v 1.33.2.30 2001/04/30 17:17:01 easysw Exp $".
dnl dnl
test/CubeView.h
+2 -3
View File
@@ -1,5 +1,5 @@
// //
// "$Id: CubeView.h,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $" // "$Id: CubeView.h,v 1.4.2.4 2001/04/30 17:17:01 easysw Exp $"
// //
// CubeView class definitions for the Fast Light Tool Kit (FLTK). // CubeView class definitions for the Fast Light Tool Kit (FLTK).
// //
@@ -30,7 +30,6 @@
#if HAVE_GL #if HAVE_GL
# include <FL/Fl_Gl_Window.H> # include <FL/Fl_Gl_Window.H>
# include <FL/gl.h> # include <FL/gl.h>
# include <GL/glu.h>
#else #else
# include <FL/Fl_Box.H> # include <FL/Fl_Box.H>
#endif /* HAVE_GL */ #endif /* HAVE_GL */
@@ -119,5 +118,5 @@ private:
#endif #endif
// //
// End of "$Id: CubeView.h,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $". // End of "$Id: CubeView.h,v 1.4.2.4 2001/04/30 17:17:01 easysw Exp $".
// //
test/fractals.cxx
+4 -4
View File
@@ -1,5 +1,5 @@
// //
// "$Id: fractals.cxx,v 1.5.2.5 2001/03/14 17:35:47 spitzak Exp $" // "$Id: fractals.cxx,v 1.5.2.6 2001/04/30 17:17:01 easysw Exp $"
// //
// Fractal drawing demo for the Fast Light Tool Kit (FLTK). // Fractal drawing demo for the Fast Light Tool Kit (FLTK).
// //
@@ -28,11 +28,11 @@
// //
#include <config.h> #include <config.h>
#if !HAVE_GL #if !HAVE_GL || !HAVE_GL_GLU_H
#include <FL/Fl.H> #include <FL/Fl.H>
#include <FL/fl_message.H> #include <FL/fl_message.H>
int main(int, char**) { int main(int, char**) {
fl_alert("This demo does not work without GL"); fl_alert("This demo does not work without GL and GLU");
return 1; return 1;
} }
#else #else
@@ -806,5 +806,5 @@ int main(int argc, char** argv)
#endif #endif
// //
// End of "$Id: fractals.cxx,v 1.5.2.5 2001/03/14 17:35:47 spitzak Exp $". // End of "$Id: fractals.cxx,v 1.5.2.6 2001/04/30 17:17:01 easysw Exp $".
// //
test/glpuzzle.cxx
+4 -4
View File
@@ -1,5 +1,5 @@
// //
// "$Id: glpuzzle.cxx,v 1.8.2.4 2001/03/14 17:35:47 spitzak Exp $" // "$Id: glpuzzle.cxx,v 1.8.2.5 2001/04/30 17:17:01 easysw Exp $"
// //
// OpenGL puzzle demo for the Fast Light Tool Kit (FLTK). // OpenGL puzzle demo for the Fast Light Tool Kit (FLTK).
// //
@@ -28,11 +28,11 @@
// this block added for fltk's distribtion so it will compile w/o OpenGL: // this block added for fltk's distribtion so it will compile w/o OpenGL:
#include <config.h> #include <config.h>
#if !HAVE_GL #if !HAVE_GL || !HAVE_GL_GLU_H
#include <FL/Fl.H> #include <FL/Fl.H>
#include <FL/fl_message.H> #include <FL/fl_message.H>
int main(int, char**) { int main(int, char**) {
fl_alert("This demo does not work without GL"); fl_alert("This demo does not work without GL and GLU");
return 1; return 1;
} }
#else #else
@@ -1480,5 +1480,5 @@ main(int argc, char **argv)
#endif // added for fltk's distribution #endif // added for fltk's distribution
// //
// End of "$Id: glpuzzle.cxx,v 1.8.2.4 2001/03/14 17:35:47 spitzak Exp $". // End of "$Id: glpuzzle.cxx,v 1.8.2.5 2001/04/30 17:17:01 easysw Exp $".
// //
visualc/config.h
+11 -2
View File
@@ -1,5 +1,5 @@
/* /*
* "$Id: config.h,v 1.5.2.4 2001/01/22 15:13:41 easysw Exp $" * "$Id: config.h,v 1.5.2.5 2001/04/30 17:17:01 easysw Exp $"
* *
* Configuration file for the Fast Light Tool Kit (FLTK) for Visual C++. * Configuration file for the Fast Light Tool Kit (FLTK) for Visual C++.
* *
@@ -44,6 +44,15 @@
#define HAVE_GL 1 #define HAVE_GL 1
/*
* HAVE_GL_GLU_H:
*
* Do you have the OpenGL Utility Library header file?
* (many broken Mesa RPMs do not...)
*/
#define HAVE_GL_GLU_H 1
/* /*
* USE_COLORMAP: * USE_COLORMAP:
* *
@@ -144,5 +153,5 @@
#define HAVE_POLL 0 #define HAVE_POLL 0
/* /*
* End of "$Id: config.h,v 1.5.2.4 2001/01/22 15:13:41 easysw Exp $". * End of "$Id: config.h,v 1.5.2.5 2001/04/30 17:17:01 easysw Exp $".
*/ */