@@ -91,10 +91,11 @@
 		LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition"
 		LIBS="$LIBS -lversion"
 
 		AC_SUBST(ALLOW_MULTIPLE_DEFINITION,
 			[-Wl,--allow-multiple-definition])
+		AC_SUBST(USE_SRCS_WINDOWS, '${SRCS_WINDOWS}')
 		;;
 	*-psp-*)
 		AS_IF([test x"$DEVKITPSP" = x""], [
 			AC_MSG_ERROR(
 				[DEVKITPSP is not set! Please set DEVKITPSP.])
@@ -817,16 +818,10 @@
 	AC_MSG_RESULT($ac_cv_snprintf_useful_ret)
 ])
 test x"$have_asprintf" != x"yes" -a x"$ac_cv_snprintf_useful_ret" != x"yes" && \
 	AC_MSG_ERROR(No asprintf and no snprintf returning required space!)
 
-case "$host_os" in
-mingw*)
-	AC_SUBST(OFSTDIOSTREAM_WIN32CONSOLE_M, "OFStdIOStream_Win32Console.m")
-	;;
-esac
-
 AC_ARG_ENABLE(unicode-tables,
 	AS_HELP_STRING([--disable-unicode-tables], [Disable Unicode tables]))
 AS_IF([test x"$enable_unicode_tables" != x"no"], [
 	AC_DEFINE(OF_HAVE_UNICODE_TABLES, 1,
 		[Whether to build with Unicode tables])