fly/flightgear
1
0
Fork 0
Code Activity

fgpanel: fix compile for OSX

Browse source
This commit is contained in:
Torsten Dreyer 2011-06-04 21:27:04 +02:00
parent c9bb9f6044
commit 8d67103214
6 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
utils/fgpanel/FGGLApplication.cxx
View file

@ -21,12 +21,19 @@
#endif #endif
#include "FGGLApplication.hxx" #include "FGGLApplication.hxx"
#include <simgear/compiler.h>
#ifdef HAVE_WINDOWS_H #ifdef HAVE_WINDOWS_H
#include <windows.h> #include <windows.h>
#define snprintf sprintf_s #define snprintf sprintf_s
#endif #endif
#if defined (SG_MAC)
#include <OpenGL/gl.h>
#include <GLUT/glut.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glut.h> #include <GL/glut.h>
#endif
#include <iostream> #include <iostream>
#include <exception> #include <exception>

6
utils/fgpanel/FGPNGTextureLoader.cxx
View file

@ -22,7 +22,11 @@
#endif #endif
#include "FGPNGTextureLoader.hxx" #include "FGPNGTextureLoader.hxx"
#include <GL/glu.h> #if defined (SG_MAC)
#include <GLUT/glut.h>
#else
#include <GL/glut.h>
#endif
#include <png.h> #include <png.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

5
utils/fgpanel/FGPanelApplication.cxx
View file

@ -26,8 +26,13 @@
#include "FGGLApplication.hxx" #include "FGGLApplication.hxx"
#include "FGPanelApplication.hxx" #include "FGPanelApplication.hxx"
#if defined (SG_MAC)
#include <OpenGL/gl.h>
#include <GLUT/glut.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glut.h> #include <GL/glut.h>
#endif
#include <simgear/math/SGMisc.hxx> #include <simgear/math/SGMisc.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>

7
utils/fgpanel/FGRGBTextureLoader.cxx
View file

@ -26,8 +26,13 @@
#endif #endif
#include "FGRGBTextureLoader.hxx" #include "FGRGBTextureLoader.hxx"
#if defined (SG_MAC)
#include <OpenGL/gl.h>
#include <GLUT/glut.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glut.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

6
utils/fgpanel/FGTextureLoaderInterface.hxx
View file

@ -17,8 +17,12 @@
// //
#ifndef __FGTEXTURELOADERINTERFACE_HXX #ifndef __FGTEXTURELOADERINTERFACE_HXX
#define __FGTEXTURELOADERINTERFACE_HXX #define __FGTEXTURELOADERINTERFACE_HXX
#include <simgear/compiler.h>
#if defined (SG_MAC)
#include <OpenGL/gl.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#endif
#include <string> #include <string>
class FGTextureLoaderInterface { class FGTextureLoaderInterface {
public: public:

4
utils/fgpanel/panel.cxx
View file

@ -31,7 +31,11 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#if defined (SG_MAC)
#include <GLUT/glut.h>
#else
#include <GL/glut.h> #include <GL/glut.h>
#endif
#include <plib/fnt.h> #include <plib/fnt.h>