[Gnash-commit] gnash/libbase image.h tu_opengl_includes.h

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/08/27 18:09:48

Modified files:
        libbase        : image.h tu_opengl_includes.h 

Log message:
        porting to WIN32

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_opengl_includes.h?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: image.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- image.h     26 Aug 2006 18:20:50 -0000      1.8
+++ image.h     27 Aug 2006 18:09:48 -0000      1.9
@@ -12,7 +12,7 @@
 #include "tu_config.h"
 #include "tu_types.h"
 class tu_file;
-namespace jpeg { struct input; }
+namespace jpeg { class input; }
 
 
 /// Handy image utilities for RGB surfaces.

Index: tu_opengl_includes.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_opengl_includes.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tu_opengl_includes.h        24 Aug 2006 23:43:46 -0000      1.4
+++ tu_opengl_includes.h        27 Aug 2006 18:09:48 -0000      1.5
@@ -62,7 +62,21 @@
 #endif // no WIN32 or OSX
 
 // GL extension constants...
-#include <GL/glext.h>
+#if defined(_WIN32) || defined(WIN32)
+# define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+# define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+# define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+# define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+# define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+# define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV        0x8533
+# define GL_TEXTURE0_ARB                   0x84C0
+# define GL_TEXTURE1_ARB                   0x84C1
+# define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+# define GL_CLAMP_TO_EDGE                  0x812F
+# define GL_ALL_COMPLETED_NV               0x84F2
+#else
+#      include <GL/glext.h>
+#endif
 
 #endif // TU_OPENGL_INCLUDES_H