Mac fix from Ima Sudonim

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

diff --git a/simgear/screen/RenderTexture.h b/simgear/screen/RenderTexture.h
index d2c9da4976bdcba52de8a1841fe946e8c47ecb92..5d68a02c698d6b076fd506f646b4ead417b02f01 100644 (file)
--- a/simgear/screen/RenderTexture.h
+++ b/simgear/screen/RenderTexture.h
@@ -27,6 +27,7 @@
 // Original RenderTexture code: Mark J. Harris
 // Original Render-to-depth-texture support: Thorsten Scheuermann
 // Linux Copy-to-texture: Eric Werness
+// OS X: Alexander Powell (someone please help)
 // Various Bug Fixes: Daniel (Redge) Sperl 
 //                    Bill Baxter
 //
@@ -45,25 +46,20 @@
  * Changelog:
  *
  * Jan. 2005, Removed GLEW dependencies, Erik Hofman
- *            Added MacOS X support
+ * Mar. 2006, Added MAC OS X support, Alexander Powell
  */
 #include <simgear/compiler.h>
 
-#if !defined( _WIN32 ) && !defined( __APPLE__ )
+#if !defined( _WIN32 ) && !defined( __MACH__ )
 #  include <X11/Xlib.h>
 #endif
 #include SG_GL_H
+#if defined( __MACH__)
+#  include <OpenGL/OpenGL.h>
+#endif
 #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>
@@ -346,8 +342,11 @@ protected: // data
     
     HDC          _hPreviousDC;
     HGLRC        _hPreviousContext;
-#elif defined( __APPLE__ )
-    
+#elif defined( __MACH__ )
+    CGLContextObj      _hGLContext;
+    CGLPBufferObj   _hPBuffer;
+   
+    CGLContextObj      _hPreviousContext;
 #else
     Display     *_pDisplay;
     GLXContext   _hGLContext;