From 663f2b4ae178c323fe2f38e3d7f78c89c7775c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Wed, 5 Oct 2016 11:34:07 +0200 Subject: [PATCH] build: Require MinGW-w64 for crossbuilds. Since dc7504c7fcbffea36da874da59fe1c07ccdfb8b1 we require "-municode" support from cross compilers. Older MinGW32 doesn't support this option. --- m4/check-mingw-prog.m4 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/m4/check-mingw-prog.m4 b/m4/check-mingw-prog.m4 index 7ce387fb..d0137ebe 100644 --- a/m4/check-mingw-prog.m4 +++ b/m4/check-mingw-prog.m4 @@ -1,8 +1,7 @@ dnl VKD3D_CHECK_MINGW32_PROG(cc-variable, crosstarget-variable, [value-if-not-found], [path]) AC_DEFUN([VKD3D_CHECK_MINGW32_PROG], [AC_SUBST([$2], [$3]) -vkd3d_mingw_list="m4_foreach([vkd3d_mingw_prefix], [w64-mingw32, pc-mingw32, mingw32, mingw32msvc], - m4_foreach([vkd3d_cpu], [i686, i586, i486, i386], [vkd3d_cpu-vkd3d_mingw_prefix-gcc ])) mingw32-gcc" +vkd3d_mingw_list="m4_foreach([vkd3d_cpu], [i686, i586, i486, i386], [vkd3d_cpu-w64-mingw32-gcc ])" AC_CHECK_PROGS([$1], [$vkd3d_mingw_list], [$3], [$4]) AS_VAR_PUSHDEF([vkd3d_cross_cc], [$1])dnl AS_VAR_IF([vkd3d_cross_cc], [$3], @@ -21,8 +20,7 @@ AS_VAR_POPDEF([vkd3d_cross_cc])dnl dnl VKD3D_CHECK_MINGW64_PROG(cc-variable, crosstarget-variable, [value-if-not-found], [path]) AC_DEFUN([VKD3D_CHECK_MINGW64_PROG], [AC_SUBST([$2], [$3]) -vkd3d_mingw_list="m4_foreach([vkd3d_mingw_prefix], [pc-mingw32, w64-mingw32, mingw32msvc], - m4_foreach([vkd3d_cpu], [x86_64, amd64], [vkd3d_cpu-vkd3d_mingw_prefix-gcc ]))" +vkd3d_mingw_list="m4_foreach([vkd3d_cpu], [x86_64, amd64], [vkd3d_cpu-w64-mingw32-gcc ])" AC_CHECK_PROGS([$1], [$vkd3d_mingw_list], [$3], [$4]) AS_VAR_PUSHDEF([vkd3d_cross_cc], [$1])dnl AS_VAR_IF([vkd3d_cross_cc], [$3],