X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscreen%2Ftr.h;h=57c13959067d99bc4ad0b8742e997c43277d66a4;hb=f19e83dcf10d5fced3d799c884a4654d7ada6548;hp=e57b008d15d73fa71915f839dca34176535c1f36;hpb=505f561e1cb302f6a0d5285155d8b421dd71b83c;p=simgear.git

diff --git a/simgear/screen/tr.h b/simgear/screen/tr.h
index e57b008d..57c13959 100644
--- a/simgear/screen/tr.h
+++ b/simgear/screen/tr.h
@@ -2,6 +2,32 @@
 
 /*
  * $Log$
+ * Revision 1.4  2008/07/27 16:10:37  ehofman
+ *
+ *
+ *  - remove the SG_GLxxxx_H #defines, since OSG provides its own versions
+ *  - this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
+ *    extensions.hxx was pulling in all of Carbon to the global namespace
+ *    - very scary. As a result, I now need to explicitly include CoreFoundation
+ *    in fg_init.cxx.
+ *  - change SG_USING_STD(x) to using std::x
+ *
+ * Issues:
+ *
+ *  - the logic for X11 and Win32 in RenderTexture and extensions is tortured,
+ *    please see if you agree I got all the ifdefs correct.
+ *
+ * Revision 1.3  2006/02/21 10:47:21  ehofman
+ * Back out the previous patch.
+ *
+ * Revision 1.2  2004/11/18 19:10:34  curt
+ * Abstract out location of gl.h, glut.h, and glu.h includes so that we can
+ * make the Mac platform happy since they put these in a different place compared
+ * to the rest of the world.
+ *
+ * Revision 1.1.1.1  2002/09/07 02:58:19  curt
+ * Initial revsion of Simgear-0.3.0
+ *
  * Revision 1.1  2001/06/26 15:19:39  curt
  * Added tr.cxx / tr.h, Brian Paul's LGPL'd tiled rendering support libs for
  * rendering ultra high res "tiled" screen shots.
@@ -72,8 +98,9 @@
 #ifndef TR_H
 #define TR_H
 
+#include <simgear/compiler.h>
 
-#include <GL/gl.h>
+#include <osg/GL>
 
 
 //#ifdef __cplusplus