ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed dependency on gdkglext as we already have one on 

gtkglext.
This commit is contained in:
yabause 2009-01-07 23:06:13 +00:00
parent 2941e5c05b
commit d10d9c6690
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
desmume/configure.ac
View File

@ -108,9 +108,6 @@ AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [
AC_SUBST(GTHREAD_CFLAGS) AC_SUBST(GTHREAD_CFLAGS)
AC_SUBST(GTHREAD_LIBS) AC_SUBST(GTHREAD_LIBS)
AC_CHECK_LIB(gdkglext-x11-1.0, gdk_gl_init)
PKG_CHECK_MODULES(LIBGLADE, PKG_CHECK_MODULES(LIBGLADE,
"libglade-2.0", "libglade-2.0",
HAVE_LIBGLADE=yes, HAVE_LIBGLADE=yes,

6
desmume/src/gtk-glade/callbacks_IO.cpp
View File

@ -76,7 +76,7 @@ void black_screen () {
memset(on_screen_image32,0,screen_size()); memset(on_screen_image32,0,screen_size());
} }
#ifndef HAVE_LIBGDKGLEXT_X11_1_0 #ifndef GTKGLEXT_AVAILABLE
// they are empty if no opengl // they are empty if no opengl
// else see gdk_gl.c / gdk_gl.h // else see gdk_gl.c / gdk_gl.h
BOOL my_gl_Begin (int screen) { return FALSE; } BOOL my_gl_Begin (int screen) { return FALSE; }
@ -163,7 +163,7 @@ gboolean screen (GtkWidget * widget, int off) {
GDK_RGB_DITHER_NONE,((guchar*)on_screen_image32)+off,L); GDK_RGB_DITHER_NONE,((guchar*)on_screen_image32)+off,L);
return TRUE; return TRUE;
} }
#endif /* if HAVE_LIBGDKGLEXT_X11_1_0 */ #endif /* if GTKGLEXT_AVAILABLE */
/* OUTPUT SCREENS */ /* OUTPUT SCREENS */
@ -183,7 +183,7 @@ gboolean on_wDrawScreen_configure_event(GtkWidget *widget, GdkEventConfigure *e
/* ***** ***** INPUT STYLUS / MOUSE ***** ***** */ /* ***** ***** INPUT STYLUS / MOUSE ***** ***** */
static void resize_incremental(int i, GdkEventScroll *event) { static void resize_incremental(int i, GdkEventScroll *event) {
#ifdef HAVE_LIBGDKGLEXT_X11_1_0 #ifdef GTKGLEXT_AVAILABLE
float zoom_inc=.125, zoom_min=0.25, zoom_max=5.0; float zoom_inc=.125, zoom_min=0.25, zoom_max=5.0;
#else #else
float zoom_inc=1.0, zoom_min=1.0, zoom_max=3.0; float zoom_inc=1.0, zoom_min=1.0, zoom_max=3.0;

3
desmume/src/gtk-glade/gdk_gl.h
View File

@ -23,8 +23,7 @@
#define __GDKGL_H__ #define __GDKGL_H__
#include "globals.h" #include "globals.h"
// comment for GL :D
//#undef HAVE_LIBGDKGLEXT_X11_1_0
#ifdef GTKGLEXT_AVAILABLE #ifdef GTKGLEXT_AVAILABLE
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h> #include <GL/glext.h>