Cygwin fixes.

[simgear.git] / simgear / screen / RenderTexture.h

diff --git a/simgear/screen/RenderTexture.h b/simgear/screen/RenderTexture.h
index b5e7b89fced9319ca0c45bd0437eb2e2dc528d3f..d2c9da4976bdcba52de8a1841fe946e8c47ecb92 100644 (file)
--- a/simgear/screen/RenderTexture.h
+++ b/simgear/screen/RenderTexture.h
@@ -45,14 +45,25 @@
  * Changelog:
  *
  * Jan. 2005, Removed GLEW dependencies, Erik Hofman
+ *            Added MacOS X support
  */
 #include <simgear/compiler.h>
 
-#ifndef _WIN32
-#include <X11/Xlib.h>
+#if !defined( _WIN32 ) && !defined( __APPLE__ )
+#  include <X11/Xlib.h>
 #endif
 #include SG_GL_H
-#include SG_GLX_H
+#ifndef _WIN32
+#  include SG_GLX_H
+#endif
+#ifdef __APPLE__
+#  ifndef None
+#     define None false
+#  endif
+#  ifndef True
+#     define True true
+#  endif
+#endif 
 
 #include <string>
 #include <vector>
@@ -335,6 +346,8 @@ protected: // data
     
     HDC          _hPreviousDC;
     HGLRC        _hPreviousContext;
+#elif defined( __APPLE__ )
+    
 #else
     Display     *_pDisplay;
     GLXContext   _hGLContext;
@@ -346,8 +359,8 @@ protected: // data
     
     // Texture stuff
     GLenum       _iTextureTarget;
-    unsigned int _iTextureID;
-    unsigned int _iDepthTextureID;
+    GLuint       _iTextureID;
+    GLuint       _iDepthTextureID;
     
     unsigned short* _pPoorDepthTexture; // [Redge]