diff --git a/desmume/configure.ac b/desmume/configure.ac
index af5423199..0dd310d1a 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -39,10 +39,15 @@ case $target in
 		UI_DIR=gtk
 		AC_SUBST([UI_DIR])
 		;;
+	*mingw*)
+		UI_DIR=windows
+		AC_SUBST([UI_DIR])
+		;;
 esac
 
 AC_CONFIG_FILES([Makefile
 	src/Makefile
 	src/gtk/Makefile
+	src/windows/Makefile
 ])
 AC_OUTPUT
diff --git a/desmume/src/windows/Makefile.am b/desmume/src/windows/Makefile.am
new file mode 100644
index 000000000..52f950d1c
--- /dev/null
+++ b/desmume/src/windows/Makefile.am
@@ -0,0 +1,10 @@
+bin_PROGRAMS = desmume
+desmume_SOURCES = \
+	CWindow.cpp CWindow.hpp IORegView.cpp IORegView.hpp \
+	des_view.cpp des_view.hpp ginfo.cpp ginfo.hpp \
+	main.cpp mapView.cpp mapView.hpp mem_view.cpp mem_view.hpp \
+	oamView.cpp oamView.hpp palView.cpp palView.hpp \
+	resource.h tileView.cpp tileView.hpp yopyop_private.hpp
+desmume_LDADD = ../libdesmume.a yopyop_private.o
+yopyop_private.o: yopyop_private.rc resources.rc resource.h
+	windres yopyop_private.rc -o yopyop_private.o
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 7aaf1d40a..41467f0d9 100644
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@@ -20,7 +20,7 @@
 */
 
 #include <windows.h>
-#include "resource.hpp"
+#include "resource.h"
  
 IconDeSmuME ICON MOVEABLE PURE LOADONCALL DISCARDABLE "DeSmuME.ico"
 //IconDeSmuME ICON MOVEABLE PURE LOADONCALL DISCARDABLE "DeSmuME3D.ico"