Search
lxdream.org :: lxdream :: r540:a3767018a96d
lxdream 0.9.1
released Jun 29
Download Now
changeset540:a3767018a96d
parent539:75f3e594d4a7
child541:6986c644d58a
authornkeynes
dateWed Nov 21 11:44:30 2007 +0000 (11 years ago)
Support darwin OpenGL/* headers as well as the more usual GL/*
src/display.h
src/drivers/gl_common.c
src/drivers/gl_fbo.c
src/drivers/gl_sl.c
src/pvr2/rendbkg.c
src/pvr2/rendcore.c
1.1 --- a/src/display.h Wed Nov 21 11:40:15 2007 +0000
1.2 +++ b/src/display.h Wed Nov 21 11:44:30 2007 +0000
1.3 @@ -22,8 +22,14 @@
1.4
1.5 #include <stdint.h>
1.6 #include <glib.h>
1.7 +#include "lxdream.h"
1.8 +#ifdef APPLE_BUILD
1.9 +#include <OpenGL/gl.h>
1.10 +#include <OpenGL/glext.h>
1.11 +#else
1.12 #include <GL/gl.h>
1.13 -#include "lxdream.h"
1.14 +#include <GL/glext.h>
1.15 +#endif
1.16
1.17 #ifdef __cplusplus
1.18 extern "C" {
1.19 @@ -166,6 +172,7 @@
1.20
1.21 extern display_driver_t display_driver;
1.22
1.23 +extern struct display_driver display_agl_driver;
1.24 extern struct display_driver display_gtk_driver;
1.25 extern struct display_driver display_null_driver;
1.26
2.1 --- a/src/drivers/gl_common.c Wed Nov 21 11:40:15 2007 +0000
2.2 +++ b/src/drivers/gl_common.c Wed Nov 21 11:44:30 2007 +0000
2.3 @@ -18,8 +18,7 @@
2.4
2.5 #include <sys/time.h>
2.6
2.7 -#include <GL/gl.h>
2.8 -#include "dream.h"
2.9 +#include "display.h"
2.10 #include "pvr2/pvr2.h"
2.11 #include "drivers/gl_common.h"
2.12
3.1 --- a/src/drivers/gl_fbo.c Wed Nov 21 11:40:15 2007 +0000
3.2 +++ b/src/drivers/gl_fbo.c Wed Nov 21 11:44:30 2007 +0000
3.3 @@ -24,8 +24,6 @@
3.4
3.5 #define GL_GLEXT_PROTOTYPES 1
3.6
3.7 -#include <GL/gl.h>
3.8 -#include <GL/glext.h>
3.9 #include <stdlib.h>
3.10 #include "lxdream.h"
3.11 #include "display.h"
4.1 --- a/src/drivers/gl_sl.c Wed Nov 21 11:40:15 2007 +0000
4.2 +++ b/src/drivers/gl_sl.c Wed Nov 21 11:44:30 2007 +0000
4.3 @@ -20,11 +20,9 @@
4.4
4.5 #define GL_GLEXT_PROTOTYPES 1
4.6
4.7 -#include <GL/gl.h>
4.8 -#include <GL/glext.h>
4.9 #include "lxdream.h"
4.10 +#include "display.h"
4.11 #include "drivers/gl_common.h"
4.12 -#include "display.h"
4.13
4.14 #define MAX_ERROR_BUF 4096
4.15
5.1 --- a/src/pvr2/rendbkg.c Wed Nov 21 11:40:15 2007 +0000
5.2 +++ b/src/pvr2/rendbkg.c Wed Nov 21 11:44:30 2007 +0000
5.3 @@ -35,8 +35,8 @@
5.4 */
5.5
5.6 #include <sys/time.h>
5.7 +#include "display.h"
5.8 #include "pvr2/pvr2.h"
5.9 -#include <GL/glext.h>
5.10 #include <math.h>
5.11
5.12 #define MAX_CLAMP_LINES 8
6.1 --- a/src/pvr2/rendcore.c Wed Nov 21 11:40:15 2007 +0000
6.2 +++ b/src/pvr2/rendcore.c Wed Nov 21 11:44:30 2007 +0000
6.3 @@ -18,10 +18,7 @@
6.4 #include <sys/time.h>
6.5 #include "pvr2/pvr2.h"
6.6 #include "asic.h"
6.7 -
6.8 -#define GL_GLEXT_PROTOTYPES 1
6.9 -#include <GL/gl.h>
6.10 -#include <GL/glext.h>
6.11 +#include "display.h"
6.12
6.13 int pvr2_poly_depthmode[8] = { GL_NEVER, GL_LESS, GL_EQUAL, GL_LEQUAL,
6.14 GL_GREATER, GL_NOTEQUAL, GL_GEQUAL,
.