fixup build sys for GLX removal

the cli frontend still doesn't build, but gtk does

desmume/src/frontend/posix/configure.ac

@@ -81,16 +81,10 @@ AM_CONDITIONAL([HAVE_GL], [test "${have_gl_h}" = "yes"])
 
 dnl - if --enable-osmesa is used, check for it
 AC_ARG_ENABLE([osmesa],
-               [AC_HELP_STRING([--enable-osmesa], [use off-screen mesa, overrides GLX])],
+               [AC_HELP_STRING([--enable-osmesa], [use off-screen mesa])],
                [osmesa=$enableval],
                [osmesa=no])
 
-dnl - GLX is the default renderer
-AC_ARG_ENABLE([glx],
-               [AC_HELP_STRING([--enable-glx], [use hw accelerated rendering])],
-               [glx=$enableval],
-               [glx=yes])
-
 if test "x$osmesa" = "xyes" ; then
 	AC_CHECK_LIB(dl, main)
 	AC_CHECK_LIB([GL], main)
@@ -100,20 +94,8 @@ if test "x$osmesa" = "xyes" ; then
 		OSMESA_LIBS="-lOSMesa"
 		AC_SUBST(OSMESA_LIBS)
 	])
-else
-  if test "x$glx" = "xyes" ; then
-	AC_CHECK_LIB(dl, main)
-	AC_CHECK_LIB([GL], main)
-	AC_CHECK_HEADERS([GL/glx.h], [
-	  useglx=yes
-	  AC_DEFINE(HAVE_GL_GLX)
-	  GLX_LIBS="-lX11"
-	  AC_SUBST(GLX_LIBS)
-	])
-  fi
 fi
 AM_CONDITIONAL([HAVE_LIBOSMESA],  [test "${useosmesa}" = "yes"])
-AM_CONDITIONAL([HAVE_GL_GLX],	  [test "${useglx}" = "yes"])
 
 dnl - make the usage of libagg for HUD rendering configurable
 AC_ARG_ENABLE([hud],

desmume/src/frontend/posix/gtk/Makefile.am

@@ -21,7 +21,7 @@ desmume_SOURCES = \
 	../shared/sndsdl.cpp \
 	../shared/ctrlssdl.h ../shared/ctrlssdl.cpp \
 	osmesa_3Demu.cpp osmesa_3Demu.h \
-	glx_3Demu.cpp glx_3Demu.h \
+	sdl_3Demu.cpp sdl_3Demu.h \
 	cheatsGTK.h cheatsGTK.cpp \
 	main.cpp main.h
 desmume_LDADD = ../libdesmume.a \
@@ -29,9 +29,6 @@ desmume_LDADD = ../libdesmume.a \
 if HAVE_LIBOSMESA
 desmume_LDADD += $(OSMESA_LIBS)
 else
-if HAVE_GL_GLX
-desmume_LDADD += $(GLX_LIBS)
-endif
 endif
 
 UPDATE_DESKTOP = \