fgpanel: fix compile for OSX
This commit is contained in:
parent
c9bb9f6044
commit
8d67103214
6 changed files with 33 additions and 4 deletions
|
@ -21,12 +21,19 @@
|
|||
#endif
|
||||
|
||||
#include "FGGLApplication.hxx"
|
||||
#include <simgear/compiler.h>
|
||||
|
||||
#ifdef HAVE_WINDOWS_H
|
||||
#include <windows.h>
|
||||
#define snprintf sprintf_s
|
||||
#define snprintf sprintf_s
|
||||
#endif
|
||||
#if defined (SG_MAC)
|
||||
#include <OpenGL/gl.h>
|
||||
#include <GLUT/glut.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glut.h>
|
||||
#endif
|
||||
|
||||
#include <iostream>
|
||||
#include <exception>
|
||||
|
|
|
@ -22,7 +22,11 @@
|
|||
#endif
|
||||
#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 <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -26,8 +26,13 @@
|
|||
|
||||
#include "FGGLApplication.hxx"
|
||||
#include "FGPanelApplication.hxx"
|
||||
#if defined (SG_MAC)
|
||||
#include <OpenGL/gl.h>
|
||||
#include <GLUT/glut.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glut.h>
|
||||
#endif
|
||||
|
||||
#include <simgear/math/SGMisc.hxx>
|
||||
#include <simgear/misc/sg_path.hxx>
|
||||
|
|
|
@ -26,8 +26,13 @@
|
|||
#endif
|
||||
|
||||
#include "FGRGBTextureLoader.hxx"
|
||||
#if defined (SG_MAC)
|
||||
#include <OpenGL/gl.h>
|
||||
#include <GLUT/glut.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
#include <GL/glut.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -17,8 +17,12 @@
|
|||
//
|
||||
#ifndef __FGTEXTURELOADERINTERFACE_HXX
|
||||
#define __FGTEXTURELOADERINTERFACE_HXX
|
||||
|
||||
#include <simgear/compiler.h>
|
||||
#if defined (SG_MAC)
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
#include <string>
|
||||
class FGTextureLoaderInterface {
|
||||
public:
|
||||
|
|
|
@ -31,7 +31,11 @@
|
|||
|
||||
#include <simgear/compiler.h>
|
||||
|
||||
#if defined (SG_MAC)
|
||||
#include <GLUT/glut.h>
|
||||
#else
|
||||
#include <GL/glut.h>
|
||||
#endif
|
||||
|
||||
#include <plib/fnt.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue