FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix the APIENTRY problem. It looks like a problem in OSG, or a conflict between OSG and plib/pui

Browse Source
This commit is contained in:
fredb
2006-11-03 18:08:46 +00:00
parent 741e9c5ed5
commit 5d3aacb892
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/math/SGMath.hxx
+3 -6
View File
@@ -22,13 +22,10 @@
#include <iosfwd> #include <iosfwd>
// FIXME, make it compile on IRIX // FIXME, make it compile on IRIX
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <osg/GL> #include <osg/GL>
#undef GLUT_APIENTRY_DEFINED // GL/glut.h undef APIENTRY when this symbol is defined. osg/GL defines it (?).
// This probably would work if we didn't use plib/pu.h that include GL/glut.h
// on its side.
#include "SGMathFwd.hxx" #include "SGMathFwd.hxx"