Enable SDL OpenGL code, fix compilation of sdl-opengl.cpp (broken because we're

compiling it as C++ now?), and make some minor tweaks to scons stuff.

SConstruct

@@ -2,9 +2,12 @@ import os
 
 # XXX path separator fixed right now
 opts = Options()
-opts.Add('PSS_STYLE', 'Path separator style', 1)
+opts.AddOptions(
-opts.Add('LSB_FIRST', 'Least significant byte first?', 1)
+  BoolOption('PSS_STYLE', 'Path separator style', 1),
-opts.Add('FRAMESKIP', 'Enable frameskipping', 1)
+  BoolOption('LSB_FIRST', 'Least significant byte first?', 1),
+  BoolOption('FRAMESKIP', 'Enable frameskipping', 1),
+  BoolOption('OPENGL',    'Enable OpenGL support', 1)
+)
 
 env = Environment(options = opts,
                   CPPDEFINES={'PSS_STYLE' : '${PSS_STYLE}',
@@ -34,11 +37,13 @@ conf = Configure(env)
 if not conf.CheckLib('SDL'):
   print 'Did not find libSDL or SDL.lib, exiting!'
   Exit(1)
-if not conf.CheckLib('z'):
+if not conf.CheckLib('z', autoadd=1):
   print 'Did not find libz or z.lib, exiting!'
   Exit(1)
 if conf.CheckFunc('asprintf'):
   conf.env.Append(CCFLAGS = " -DHAVE_ASPRINTF")
+if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c++', autoadd=1):
+  conf.env.Append(CCFLAGS = " -DOPENGL")
 
 env = conf.Finish()
 

src/SConscript

@@ -34,12 +34,13 @@ utils
 mappers""")
 #palettes
 
+Import('env')
+Export('env')
+
 for dir in subdirs:
   subdir_files = SConscript('%s/SConscript' % dir)
   file_list.append(subdir_files)
 
-Import('env')
-
 print env['LINKFLAGS']
 
 env.Program('fceu', file_list)

src/drivers/sdl/SConscript

@@ -9,9 +9,9 @@ sdl-video.cpp
 unix-netplay.cpp
 """)
 
-# XXX need to deal with opengl configuration and testing at some point
+Import('env')
-#sdl-opengl.cpp
+if 'GL' in env['LIBS']:
-#sdl-opengl.h
+  my_list.append('sdl-opengl.cpp')
 
 for x in range(len(my_list)):
   my_list[x] = 'drivers/sdl/' + my_list[x]

src/drivers/sdl/sdl-opengl.cpp

@@ -25,29 +25,54 @@ static int left,right,top,bottom; // right and bottom are not inclusive.
 static int scanlines;
 static void *HiBuffer;
 
-void APIENTRY (*p_glBindTexture)(GLenum target,GLuint texture);
+typedef void APIENTRY (*glBindTexture_Func)(GLenum target,GLuint texture);
-void APIENTRY (*p_glColorTableEXT)(GLenum target, GLenum internalformat,  GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void APIENTRY (*glColorTableEXT_Func)(GLenum target,
-void APIENTRY (*p_glTexImage2D)( GLenum target, GLint level,
+        GLenum internalformat,  GLsizei width, GLenum format, GLenum type,
-                                    GLint internalFormat,
+        const GLvoid *table);
-                                    GLsizei width, GLsizei height, GLint border,
+typedef void APIENTRY (*glTexImage2D_Func)(GLenum target, GLint level,
-                                    GLenum format, GLenum type,
+        GLint internalFormat,
-                                    const GLvoid *pixels );
+        GLsizei width, GLsizei height, GLint border,
-void APIENTRY (*p_glBegin)(GLenum mode);
+        GLenum format, GLenum type,
-void APIENTRY (*p_glVertex2f)(GLfloat x, GLfloat y);
+        const GLvoid *pixels);
-void APIENTRY (*p_glTexCoord2f)(GLfloat s, GLfloat t);
+typedef void APIENTRY (*glBegin_Func)(GLenum mode);
-void APIENTRY (*p_glEnd)(void);
+typedef void APIENTRY (*glVertex2f_Func)(GLfloat x, GLfloat y);
-void APIENTRY (*p_glEnable)(GLenum cap);
+typedef void APIENTRY (*glTexCoord2f_Func)(GLfloat s, GLfloat t);
-void APIENTRY (*p_glBlendFunc)(GLenum sfactor, GLenum dfactor);
+typedef void APIENTRY (*glEnd_Func)(void);
-const GLubyte* APIENTRY (*p_glGetString)(GLenum name);
+typedef void APIENTRY (*glEnable_Func)(GLenum cap);
-void APIENTRY (*p_glViewport)(GLint x, GLint y,GLsizei width, GLsizei height);
+typedef void APIENTRY (*glBlendFunc_Func)(GLenum sfactor, GLenum dfactor);
-void APIENTRY (*p_glGenTextures)(GLsizei n, GLuint *textures);
+typedef const GLubyte* APIENTRY (*glGetString_Func)(GLenum name);
-void APIENTRY (*p_glDeleteTextures)(GLsizei n,const GLuint *textures);
+typedef void APIENTRY (*glViewport_Func)(GLint x, GLint y,GLsizei width,
-void APIENTRY (*p_glTexParameteri)(GLenum target, GLenum pname, GLint param);
+        GLsizei height);
-void APIENTRY (*p_glClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void APIENTRY (*glGenTextures_Func)(GLsizei n, GLuint *textures);
-void APIENTRY (*p_glLoadIdentity)(void);
+typedef void APIENTRY (*glDeleteTextures_Func)(GLsizei n,
-void APIENTRY (*p_glClear)(GLbitfield mask);
+        const GLuint *textures);
-void APIENTRY (*p_glMatrixMode)(GLenum mode);
+typedef void APIENTRY (*glTexParameteri_Func)(GLenum target, GLenum pname,
-void APIENTRY (*p_glDisable)(GLenum cap);
+        GLint param);
+typedef void APIENTRY (*glClearColor_Func)(GLclampf red, GLclampf green,
+        GLclampf blue, GLclampf alpha);
+typedef void APIENTRY (*glLoadIdentity_Func)(void);
+typedef void APIENTRY (*glClear_Func)(GLbitfield mask);
+typedef void APIENTRY (*glMatrixMode_Func)(GLenum mode);
+typedef void APIENTRY (*glDisable_Func)(GLenum cap);
+glBindTexture_Func p_glBindTexture;
+glColorTableEXT_Func p_glColorTableEXT;
+glTexImage2D_Func p_glTexImage2D;
+glBegin_Func p_glBegin;
+glVertex2f_Func p_glVertex2f;
+glTexCoord2f_Func p_glTexCoord2f;
+glEnd_Func p_glEnd;
+glEnable_Func p_glEnable;
+glBlendFunc_Func p_glBlendFunc;
+glGetString_Func p_glGetString;
+glViewport_Func p_glViewport;
+glGenTextures_Func p_glGenTextures;
+glDeleteTextures_Func p_glDeleteTextures;
+glTexParameteri_Func p_glTexParameteri;
+glClearColor_Func p_glClearColor;
+glLoadIdentity_Func p_glLoadIdentity;
+glClear_Func p_glClear;
+glMatrixMode_Func p_glMatrixMode;
+glDisable_Func p_glDisable;
 
 void SetOpenGLPalette(uint8 *data)
 {
@@ -139,9 +164,9 @@ int InitOpenGL(int l, int r, int t, int b, double xscale,double yscale, int efx,
 {
  const char *extensions;
 
- #define LFG(x) if(!(p_##x = SDL_GL_GetProcAddress(#x))) return(0);
+ #define LFG(x) if(!(p_##x = (x##_Func) SDL_GL_GetProcAddress(#x))) return(0);
 
- #define LFGN(x) p_##x = SDL_GL_GetProcAddress(#x)
+ #define LFGN(x) p_##x = (x##_Func) SDL_GL_GetProcAddress(#x)
 
  LFG(glBindTexture);
  LFGN(glColorTableEXT);