@@ -96,11 +96,11 @@
 	enable_shared="no"
 	enable_threads="no"
 	enable_sockets="no"
 	;;
 *-*-mingw*)
-	LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition"
+	LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition -static-libgcc"
 	LIBS="$LIBS -lversion"
 
 	AC_SUBST(USE_SRCS_WINDOWS, '${SRCS_WINDOWS}')
 	;;
 *-psp-*)
@@ -179,19 +179,43 @@
 
 	flags="-mrvl -mcpu=750 -meabi -mhard-float"
 	OBJCFLAGS="$OBJCFLAGS $flags"
 	OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags"
 	CPPFLAGS="$CPPFLAGS -DGEKKO -I$DEVKITPRO/libogc/include"
+	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DGEKKO -I\$DEVKITPRO/libogc/include"
 	LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -meabi -mhard-float"
 	LIBS="$LIBS -L$DEVKITPRO/libogc/lib/wii -lfat -logc"
 	TESTS_LIBS="$TESTS_LIBS -lwiiuse -lbte"
 	enable_shared="no"
 	enable_threads="no"	# TODO
 	with_tls="no"
 
 	AC_DEFINE(OF_WII, 1, [Whether we are compiling for Wii])
-	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DGEKKO -I\$DEVKITPRO/libogc/include"
+	AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
+])
+
+AC_ARG_WITH(wii-u,
+	AS_HELP_STRING([--with-wii-u], [build for Wii U]))
+AS_IF([test x"$with_wii_u" = x"yes"], [
+	AS_IF([test x"$DEVKITPRO" = x""], [
+		AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.])
+	])
+
+	flags="-mcpu=750 -meabi -mhard-float"
+	OBJCFLAGS="$OBJCFLAGS $flags"
+	OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags"
+	CPPFLAGS="-isystem $DEVKITPRO/wut/include -D__WIIU__ -D__WUT__"
+	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -isystem \$DEVKITPRO/wut/include"
+	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -D__WIIU__ -D__WUT__"
+	LDFLAGS="-specs=$DEVKITPRO/wut/share/wut.specs"
+	LIBS="-L$DEVKITPRO/wut/lib -L$DEVKITPRO/wut/lib/stubs -lwut"
+	enable_files="no"	# TODO
+	enable_shared="no"	# TODO
+	enable_threads="no"	# TODO
+	enable_sockets="no"	# TODO
+
+	AC_DEFINE(OF_WII_U, 1, [Whether we are compiling for Wii U])
 	AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
 ])
 
 AC_ARG_WITH(nds,
 	AS_HELP_STRING([--with-nds], [build for Nintendo DS]))
@@ -202,20 +226,20 @@
 
 	flags="-march=armv5te -mtune=arm946e-s -mthumb -mthumb-interwork"
 	OBJCFLAGS="$OBJCFLAGS $flags"
 	OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags"
 	CPPFLAGS="$CPPFLAGS -DARM9 -I$DEVKITPRO/libnds/include"
+	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DARM9 -I\$DEVKITPRO/libnds/include"
 	ASFLAGS="$ASFLAGS -march=armv5te"
 	LDFLAGS="$LDFLAGS -specs=ds_arm9.specs"
 	LIBS="$LIBS -L$DEVKITPRO/libnds/lib -lfilesystem -lfat -lnds9"
 	enable_shared="no"
 	enable_threads="no"	# TODO
 	enable_sockets="no"	# TODO
 	check_pedantic="no"
 
 	AC_DEFINE(OF_NINTENDO_DS, 1, [Whether we are compiling for Nintendo DS])
-	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DARM9 -I\$DEVKITPRO/libnds/include"
 	AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
 ])
 
 AC_ARG_WITH(3ds,
 	AS_HELP_STRING([--with-3ds], [build for Nintendo 3DS]))
@@ -227,10 +251,11 @@
 	flags="-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft"
 	flags="$flags -mword-relocations"
 	OBJCFLAGS="$OBJCFLAGS $flags"
 	OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags"
 	CPPFLAGS="$CPPFLAGS -DARM11 -I$DEVKITPRO/libctru/include"
+	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DARM11 -I\$DEVKITPRO/libctru/include"
 	ASFLAGS="$ASFLAGS -march=armv6k"
 	LDFLAGS="$LDFLAGS -specs=3dsx.specs -march=armv6k -mtune=mpcore"
 	LDFLAGS="$LDFLAGS -mfloat-abi=hard -mtp=soft -mword-relocations"
 	LIBS="$LIBS -L$DEVKITPRO/libctru/lib -lctru"
 	enable_shared="no"
@@ -238,13 +263,36 @@
 	with_tls="no"
 	check_pedantic="no"
 
 	AC_DEFINE(OF_NINTENDO_3DS, 1,
 		[Whether we are compiling for Nintendo 3DS])
-	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -DARM11 -I\$DEVKITPRO/libctru/include"
 	AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map'])
 ])
+
+AC_ARG_WITH(nintendo-switch,
+	AS_HELP_STRING([--with-nintendo-switch], [build for Nintendo Switch]))
+AS_IF([test x"$with_nintendo_switch" = x"yes"], [
+	AS_IF([test x"$DEVKITPRO" = x""], [
+		AC_MSG_ERROR([DEVKITPRO is not set! Please set DEVKITPRO.])
+	])
+
+	flags="-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE"
+	OBJCFLAGS="$OBJCFLAGS $flags"
+	OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flags"
+	CPPFLAGS="$CPPFLAGS -D__SWITCH__ -I$DEVKITPRO/libnx/include"
+	OBJFW_CPPFLAGS="$OBJFW_CPPFLAGS -D__SWITCH__ -I$DEVKITPRO/libnx/include"
+	ASFLAGS="$ASFLAGS $flags"
+	LDFLAGS="$LDFLAGS -specs=$DEVKITPRO/libnx/switch.specs $flags"
+	LIBS="$LIBS -L$DEVKITPRO/libnx/lib -lnx"
+	enable_shared="no"
+	enable_threads="yes"
+	enable_sockets="no"	# TODO
+	check_pedantic="no"
+
+	AC_DEFINE(OF_NINTENDO_SWITCH, 1,
+		[Whether we are compiling for Nintendo Switch])
+])
 
 CPP="$OBJCPP"
 CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS -DOF_COMPILING_OBJFW"
 flags="-fexceptions -fobjc-exceptions -funwind-tables"
 flags="$flags -fconstant-string-class=OFConstantString"
@@ -350,10 +398,16 @@
 	AC_MSG_ERROR(Compiler does not support properties!)
 ])
 
 AC_CHECK_TOOL(AR, ar)
 AC_PROG_RANLIB
+
+case "$host_os" in
+mingw*)
+	AC_CHECK_TOOL(RC, windres)
+	;;
+esac
 
 AC_ARG_ENABLE(shared,
 	AS_HELP_STRING([--disable-shared], [do not build shared library]))
 AS_IF([test x"$enable_shared" != x"no"], [
 	BUILDSYS_SHARED_LIB
@@ -428,10 +482,11 @@
 	    defined(__NEWLIB__) || defined(__MORPHOS__) || defined(__MINT__)
 	egrep_cpp_yes
 	#endif
 ], [
 	AC_MSG_RESULT(yes)
+	CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 $CPPFLAGS"
 	CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS"
 	gnu_source="yes"
 ], [
 	AC_MSG_RESULT(no)
 ])
@@ -996,10 +1051,14 @@
 		;;
 	m68k-*-amigaos* | powerpc-*-amigaos*)
 		dnl Compiler TLS is broken on AmigaOS
 		enable_compiler_tls="no"
 		;;
+	*-*-mingw*)
+		dnl Causes emutls to be pulled in, which pulls in winpthread.
+		enable_compiler_tls="no"
+		;;
 	*-*-morphos*)
 		dnl Compiler TLS needs helpers that we don't want in the
 		dnl .library
 		enable_compiler_tls="no"
 		;;
@@ -1172,10 +1231,11 @@
 AC_ARG_ENABLE(files,
 	AS_HELP_STRING([--disable-files], [disable file support]))
 AS_IF([test x"$enable_files" != x"no"], [
 	AC_DEFINE(OF_HAVE_FILES, 1, [Whether we have files])
 	AC_SUBST(USE_SRCS_FILES, '${SRCS_FILES}')
+	AC_SUBST(OBJFW_NEW, "objfw-new")
 	AC_SUBST(OFARC, "ofarc")
 	AC_SUBST(OFHASH, "ofhash")
 
 	case "$host_os" in
 	msdosdjgpp*)
@@ -1338,17 +1398,17 @@
 	AC_CHECK_HEADER(netinet/tcp.h, [
 		AC_DEFINE(OF_HAVE_NETINET_TCP_H, 1,
 			[Whether we have netinet/tcp.h])
 	])
 	AC_CHECK_HEADERS([arpa/inet.h netdb.h])
+	AC_CHECK_HEADER(sys/un.h, [
+		AC_DEFINE(OF_HAVE_SYS_UN_H, 1, [Whether we have sys/un.h])
+	])
 	AC_CHECK_HEADER(netipx/ipx.h, [
 		AC_DEFINE(OF_HAVE_NETIPX_IPX_H, 1,
 			[Whether we have netipx/ipx.h])
 	])
-	AC_CHECK_HEADER(sys/un.h, [
-		AC_DEFINE(OF_HAVE_SYS_UN_H, 1, [Whether we have sys/un.h])
-	])
 
 	AC_CHECK_MEMBER([struct sockaddr_in6.sin6_addr], [
 		AC_EGREP_CPP(egrep_cpp_yes, [
 			#ifdef _WIN32
 			typedef int BOOL;
@@ -1397,10 +1457,44 @@
 		# endif
 		# include <windows.h>
 		# include <ws2tcpip.h>
 		#endif
 	])
+
+	AC_CHECK_HEADERS(afunix.h, [
+		AC_DEFINE(OF_HAVE_AFUNIX_H, 1, [Whether we have afunix.h])
+	], [], [
+		#ifdef _WIN32
+		# include <winsock2.h>
+		#endif
+	])
+	AC_CHECK_MEMBER(struct sockaddr_un.sun_path, [
+		AC_DEFINE(OF_HAVE_UNIX_SOCKETS, 1,
+			[Whether we have UNIX sockets])
+		AC_SUBST(USE_SRCS_UNIX_SOCKETS, '${SRCS_UNIX_SOCKETS}')
+	], [], [
+		#ifdef OF_HAVE_SYS_TYPES_H
+		# include <sys/types.h>
+		#endif
+		#ifdef OF_HAVE_SYS_UN_H
+		# include <sys/un.h>
+		#endif
+		#ifdef _WIN32
+		# include <winsock2.h>
+		#endif
+		#ifdef HAVE_AFUNIX_H
+		# include <afunix.h>
+		#endif
+
+		#ifdef __morphos__
+		# error MorphOS has the struct but does not support it
+		#endif
+
+		#ifdef __MINT__
+		# error Gives invalid argument at runtime
+		#endif
+	])
 
 	AC_CHECK_MEMBER(struct sockaddr_ipx.sipx_network, [], [
 		AC_CHECK_MEMBER(struct sockaddr_ipx.sa_netnum, [], [], [
 			#ifdef _WIN32
 			typedef int BOOL;
@@ -1470,44 +1564,10 @@
 			AC_DEFINE(OF_HAVE_IPX, 1, [Whether we have IPX/SPX])
 			AC_SUBST(USE_SRCS_IPX, '${SRCS_IPX}')
 		])
 	])
 
-	AC_CHECK_HEADERS(afunix.h, [
-		AC_DEFINE(OF_HAVE_AFUNIX_H, 1, [Whether we have afunix.h])
-	], [], [
-		#ifdef _WIN32
-		# include <winsock2.h>
-		#endif
-	])
-	AC_CHECK_MEMBER(struct sockaddr_un.sun_path, [
-		AC_DEFINE(OF_HAVE_UNIX_SOCKETS, 1,
-			[Whether we have UNIX sockets])
-		AC_SUBST(USE_SRCS_UNIX_SOCKETS, '${SRCS_UNIX_SOCKETS}')
-	], [], [
-		#ifdef OF_HAVE_SYS_TYPES_H
-		# include <sys/types.h>
-		#endif
-		#ifdef OF_HAVE_SYS_UN_H
-		# include <sys/un.h>
-		#endif
-		#ifdef _WIN32
-		# include <winsock2.h>
-		#endif
-		#ifdef HAVE_AFUNIX_H
-		# include <afunix.h>
-		#endif
-
-		#ifdef __morphos__
-		# error MorphOS has the struct but does not support it
-		#endif
-
-		#ifdef __MINT__
-		# error Gives invalid argument at runtime
-		#endif
-	])
-
 	AC_CHECK_FUNCS(paccept accept4, break)
 
 	AC_CHECK_FUNCS(kqueue1 kqueue, [
 		AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue])
 		AC_SUBST(OF_KQUEUE_KERNEL_EVENT_OBSERVER_M,