fly/flightgear
1
0
Fork 0
Code Activity

Change GLUT_H to FG_GLUT_H to prevent a naming clash with freeglut.

Browse source
This commit is contained in:
ehofman 2003-08-21 09:12:12 +00:00
parent 32cb0df98e
commit 6f8aa7b331
11 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -242,11 +242,11 @@ base_LIBS="$LIBS"
dnl check for glut location dnl check for glut location
AC_CHECK_HEADER(GL/glut.h) AC_CHECK_HEADER(GL/glut.h)
if test "x$ac_cv_header_GL_glut_h" = "xyes"; then if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
AC_DEFINE([GLUT_H], <GL/glut.h>, [Define as glut.h include location]) AC_DEFINE([FG_GLUT_H], <GL/glut.h>, [Define as glut.h include location])
else else
AC_CHECK_HEADER(GLUT/glut.h) AC_CHECK_HEADER(GLUT/glut.h)
if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
AC_DEFINE([GLUT_H], <GLUT/glut.h>, [Define as glut.h include location]) AC_DEFINE([FG_GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
else else
echo "Neither GL/glut.h nor GLUT/glut.h found. Cannot continue" echo "Neither GL/glut.h nor GLUT/glut.h found. Cannot continue"
exit exit

2
src/GUI/gui.h
View file

@ -33,7 +33,7 @@
# include <windows.h> # include <windows.h>
#endif #endif
#include GLUT_H // needed before pu.h #include FG_GLUT_H // needed before pu.h
#include <plib/pu.h> // plib include #include <plib/pu.h> // plib include

2
src/GUI/gui_local.cxx
View file

@ -6,7 +6,7 @@
# include <windows.h> # include <windows.h>
#endif #endif
#include GLUT_H // needed before pu.h #include FG_GLUT_H // needed before pu.h
#include <plib/pu.h> // plib include #include <plib/pu.h> // plib include
#include <FDM/flight.hxx> #include <FDM/flight.hxx>

2
src/GUI/mouse.cxx
View file

@ -38,7 +38,7 @@
# include <windows.h> # include <windows.h>
#endif #endif
#include GLUT_H #include FG_GLUT_H
#if defined(FX) && defined(XMESA) #if defined(FX) && defined(XMESA)
# include <GL/xmesa.h> # include <GL/xmesa.h>

6
src/Include/config.h-msvc6
View file

@ -189,8 +189,8 @@
#define ENABLE_AUDIO_SUPPORT #define ENABLE_AUDIO_SUPPORT
#endif #endif
#ifndef GLUT_H #ifndef FG_GLUT_H
#define GLUT_H <GL/glut.h> #define FG_GLUT_H <GL/glut.h>
#endif // #ifndef GLUT_H #endif // #ifndef FG_GLUT_H
// eof - config.h-msvc6 - single flightgear config.h file // eof - config.h-msvc6 - single flightgear config.h file

2
src/Input/input.cxx
View file

@ -37,7 +37,7 @@
#include STL_STRING #include STL_STRING
#include <vector> #include <vector>
#include GLUT_H #include FG_GLUT_H
#include <plib/pu.h> #include <plib/pu.h>

2
src/Main/bootstrap.cxx
View file

@ -48,7 +48,7 @@ SG_USING_STD(endl);
# include <float.h> # include <float.h>
#endif #endif
#include GLUT_H #include FG_GLUT_H
#ifdef macintosh #ifdef macintosh
# include <console.h> // -dw- for command line dialog # include <console.h> // -dw- for command line dialog

2
src/Main/splash.cxx
View file

@ -34,7 +34,7 @@
# include <windows.h> # include <windows.h>
#endif #endif
#include GLUT_H #include FG_GLUT_H
#include <string.h> #include <string.h>

2
src/NetworkOLK/net_hud.cxx
View file

@ -36,7 +36,7 @@
#endif #endif
#include <math.h> #include <math.h>
#include GLUT_H #include FG_GLUT_H
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
src/NetworkOLK/network.cxx
View file

@ -35,7 +35,7 @@
#endif #endif
#include <math.h> #include <math.h>
#include GLUT_H #include FG_GLUT_H
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
src/Time/light.hxx
View file

@ -38,7 +38,7 @@
# include <windows.h> # include <windows.h>
#endif #endif
#include GLUT_H #include FG_GLUT_H
#include <plib/sg.h> // plib include #include <plib/sg.h> // plib include