diff --git a/desmume/configure.ac b/desmume/configure.ac
index e3548192d..90e1abb48 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -48,49 +48,55 @@ dnl - Check for the OpenGL includes
 AC_CHECK_HEADERS([GL/gl.h])
 AC_CHECK_HEADERS([GL/glu.h])
 
-dnl - Check for GTK and/or libglade
-AC_CHECK_TOOL(HAVE_PKG, pkg-config)
-if test ! "x$HAVE_PKG" = "x" ; then
-  PKG_CHECK_MODULES(GTK,
-                    "gtk+-2.0",
-                    HAVE_GTK=yes,
-                    HAVE_GTK=no)
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
+case $target in
+  *linux* | *bsd*)
+    dnl - Check for GTK and/or libglade
+    AC_CHECK_TOOL(HAVE_PKG, pkg-config)
+    AC_PROVIDE_IFELSE([PKG_CHECK_MODULES)], [
+      if test ! "x$HAVE_PKG" = "x" ; then
+        PKG_CHECK_MODULES(GTK,
+                          "gtk+-2.0",
+                          HAVE_GTK=yes,
+                          HAVE_GTK=no)
+        AC_SUBST(GTK_CFLAGS)
+        AC_SUBST(GTK_LIBS)
 
-  PKG_CHECK_MODULES(GTKGLEXT,
-                    "gtkglext-1.0",
-                    HAVE_GTKGLEXT=yes,
-                    HAVE_GTKGLEXT=no)
-  AC_SUBST(GTKGLEXT_CFLAGS)
-  AC_SUBST(GTKGLEXT_LIBS)
+        PKG_CHECK_MODULES(GTKGLEXT,
+                          "gtkglext-1.0",
+                          HAVE_GTKGLEXT=yes,
+                          HAVE_GTKGLEXT=no)
+        AC_SUBST(GTKGLEXT_CFLAGS)
+        AC_SUBST(GTKGLEXT_LIBS)
 
-  PKG_CHECK_MODULES(GTHREAD,
-                    "gthread-2.0",
-                    HAVE_GTHREAD=yes,
-                    HAVE_GTHREAD=no)
-  AC_SUBST(GTHREAD_CFLAGS)
-  AC_SUBST(GTHREAD_LIBS)
+        PKG_CHECK_MODULES(GTHREAD,
+                          "gthread-2.0",
+                          HAVE_GTHREAD=yes,
+                          HAVE_GTHREAD=no)
+        AC_SUBST(GTHREAD_CFLAGS)
+        AC_SUBST(GTHREAD_LIBS)
 
 
-  AC_CHECK_LIB(gdkglext-x11-1.0, gdk_gl_init)
+        AC_CHECK_LIB(gdkglext-x11-1.0, gdk_gl_init)
 
-  PKG_CHECK_MODULES(LIBGLADE,
-                    "libglade-2.0",
-                    HAVE_LIBGLADE=yes,
-                    HAVE_LIBGLADE=no)
-  AC_SUBST(LIBGLADE_CFLAGS)
-  AC_SUBST(LIBGLADE_LIBS)
+        PKG_CHECK_MODULES(LIBGLADE,
+                          "libglade-2.0",
+                          HAVE_LIBGLADE=yes,
+                          HAVE_LIBGLADE=no)
+        AC_SUBST(LIBGLADE_CFLAGS)
+        AC_SUBST(LIBGLADE_LIBS)
+    
+        dnl uninstalled glade ui dir
+        AC_DEFINE_UNQUOTED(GLADEUI_UNINSTALLED_DIR,"`pwd`/src/gtk-glade/glade/",[path to glade ui dir])
+        AC_SUBST(GLADEUI_UNINSTALLED_DIR)
+      fi
+    ])
 
-  dnl uninstalled glade ui dir
-  AC_DEFINE_UNQUOTED(GLADEUI_UNINSTALLED_DIR,"`pwd`/src/gtk-glade/glade/",[path to glade ui dir])
-  AC_SUBST(GLADEUI_UNINSTALLED_DIR)
-fi
-
-dnl - If the gtkGLext package is available define the corresponding C macro
-if test "x$HAVE_GTKGLEXT" = "xyes"; then
-   AC_DEFINE([GTKGLEXT_AVAILABLE], [1])
-fi
+    dnl - If the gtkGLext package is available define the corresponding C macro
+    if test "x$HAVE_GTKGLEXT" = "xyes"; then
+       AC_DEFINE([GTKGLEXT_AVAILABLE], [1])
+    fi
+    ;;
+esac
 
 dnl - Determine which UI's to build
 if test "x$HAVE_SDL" = "xyes"; then
@@ -109,7 +115,7 @@ fi
 
 case $target in
   *mingw*)
-    LIBS="$LIBS -ldxguid -ldxerr8 -ldsound -mwindows"
+    LIBS="$LIBS -ldxguid -ldxerr8 -ldsound -lopengl32 -lws2_32 -mwindows"
     UI_DIR="windows"
     ;;
 esac
diff --git a/desmume/src/opengl_collector_3Demu.c b/desmume/src/opengl_collector_3Demu.c
index c28f20732..087f39ba3 100644
--- a/desmume/src/opengl_collector_3Demu.c
+++ b/desmume/src/opengl_collector_3Demu.c
@@ -1,4 +1,4 @@
-/* $Id: opengl_collector_3Demu.c,v 1.14 2007-05-07 22:58:12 masscat Exp $
+/* $Id: opengl_collector_3Demu.c,v 1.15 2007-06-25 03:16:50 cyberwarriorx Exp $
  */
 /*  
 	Copyright (C) 2006-2007 Ben Jaques, shash
@@ -47,6 +47,7 @@
 
 #ifdef HAVE_GL_GL_H
 #ifdef HAVE_GL_GLU_H
+#ifndef __MINGW32__
 
 #include <stdio.h>
 
@@ -3011,5 +3012,6 @@ GPU3DInterface gpu3D_opengl_collector = {
 
 
 
+#endif /* End of __MINGW32__ */
 #endif /* End of HAVE_GL_GLU_H */
 #endif /* End of HAVE_GL_GL_H */
diff --git a/desmume/src/windows/Makefile.am b/desmume/src/windows/Makefile.am
index 5f3fc6094..b46fdf9dc 100644
--- a/desmume/src/windows/Makefile.am
+++ b/desmume/src/windows/Makefile.am
@@ -14,6 +14,6 @@ desmume_SOURCES = \
         ConfigKeys.c ConfigKeys.h \
 	FirmConfig.c FirmConfig.h \
 	OGLRender.c OGLRender.h
-desmume_LDADD = ../libdesmume.a yopyop_private.o
+desmume_LDADD = ../libdesmume.a yopyop_private.o ../gdbstub/libgdbstub.a
 yopyop_private.o: yopyop_private.rc resources.rc resource.h
 	windres yopyop_private.rc -o yopyop_private.o