diff --git a/desmume/configure.ac b/desmume/configure.ac
index 959fd2f67..24e95483c 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -33,10 +33,12 @@ case $target in
 			GTK_CFLAGS="$GTK_CFLAGS $SDL_CFLAGS"
 			GTK_LIBS="$GTK_LIBS $SDL_LIBS"
 		fi
+		AC_SUBST(SDL_CFLAGS)
+		AC_SUBST(SDL_LIBS)
 		AC_SUBST(GTK_CFLAGS)
 		AC_SUBST(GTK_LIBS)
 
-		UI_DIR=gtk
+		UI_DIR="gtk cli"
 		AC_SUBST([UI_DIR])
 		;;
 	*mingw*)
@@ -50,6 +52,7 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug, enable debug information) ,
 
 AC_CONFIG_FILES([Makefile
 	src/Makefile
+	src/cli/Makefile
 	src/gtk/Makefile
 	src/windows/Makefile
 ])
diff --git a/desmume/src/cli/Makefile.am b/desmume/src/cli/Makefile.am
new file mode 100644
index 000000000..61ff08f70
--- /dev/null
+++ b/desmume/src/cli/Makefile.am
@@ -0,0 +1,4 @@
+bin_PROGRAMS = desmume-cli
+desmume_cli_SOURCES = main.cpp
+desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS)
+desmume_cli_CXXFLAGS = $(SDL_CFLAGS)