wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

build: Rewrite checks for MinGW using polymorphic shell variables.

Browse Source
This commit is contained in:
Józef Kucia 2016-09-28 13:07:51 +02:00
parent f931d3ad66
commit 30a19692af
2 changed files with 31 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -46,8 +46,8 @@ VKD3D_CHECK_SYNC_ADD_AND_FETCH_FUNC
VKD3D_CHECK_SYNC_SUB_AND_FETCH_FUNC VKD3D_CHECK_SYNC_SUB_AND_FETCH_FUNC
dnl Check for cross compilers dnl Check for cross compilers
VKD3D_CHECK_MINGW32_PROG(CROSSCC32, CROSSTARGET32, false) VKD3D_CHECK_MINGW32_PROG(CROSSCC32, CROSSTARGET32, [false])
VKD3D_CHECK_MINGW64_PROG(CROSSCC64, CROSSTARGET64, false) VKD3D_CHECK_MINGW64_PROG(CROSSCC64, CROSSTARGET64, [false])
AM_CONDITIONAL([HAS_CROSSTARGET32], [test "x$CROSSTARGET32" != xfalse]) AM_CONDITIONAL([HAS_CROSSTARGET32], [test "x$CROSSTARGET32" != xfalse])
AM_CONDITIONAL([HAS_CROSSTARGET64], [test "x$CROSSTARGET64" != xfalse]) AM_CONDITIONAL([HAS_CROSSTARGET64], [test "x$CROSSTARGET64" != xfalse])

75
m4/check-mingw-prog.m4
View File

@ -1,56 +1,39 @@
dnl VKD3D_CHECK_MINGW32_PROG(variable, crosstarget-variable, [value-if-not-found], [path]) dnl VKD3D_CHECK_MINGW32_PROG(cc-variable, crosstarget-variable, [value-if-not-found], [path])
AC_DEFUN([VKD3D_CHECK_MINGW32_PROG], AC_DEFUN([VKD3D_CHECK_MINGW32_PROG],
[ [AC_SUBST([$2], [$3])
AC_SUBST([$2], [$3])dnl
vkd3d_mingw_list="m4_foreach([vkd3d_mingw_prefix], [w64-mingw32, pc-mingw32, mingw32, mingw32msvc], 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 ])) m4_foreach([vkd3d_cpu], [i686, i586, i486, i386], [vkd3d_cpu-vkd3d_mingw_prefix-gcc ])) mingw32-gcc"
mingw32-gcc"
AC_CHECK_PROGS([$1], [$vkd3d_mingw_list], [$3], [$4]) AC_CHECK_PROGS([$1], [$vkd3d_mingw_list], [$3], [$4])
if test "x[$]$1" != x$3 AS_VAR_PUSHDEF([vkd3d_cross_cc], [$1])dnl
then AS_VAR_IF([vkd3d_cross_cc], [$3],
vkd3d_cc_saved="$CC" [],
CC="[$]$1" [vkd3d_cc_saved="$CC"
AC_MSG_CHECKING([whether $CC works]) AS_VAR_COPY([CC], [vkd3d_cross_cc])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], AC_MSG_CHECKING([whether $CC works])
[AC_MSG_RESULT([yes]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
set x [$]$1 [AC_MSG_RESULT([yes])
shift $2=`expr "$CC" : '\(.*\)-gcc'`],
while test "[$]#" -ge 1 [AC_MSG_RESULT([no])])
do CC="$vkd3d_cc_saved"])
case "[$]1" in AS_VAR_POPDEF([vkd3d_cross_cc])dnl
*-gcc) $2=`expr "[$]1" : '\(.*\)-gcc'` ;;
esac
shift
done],
[AC_MSG_RESULT([no])])
CC="$vkd3d_cc_saved"
fi
]) ])
dnl VKD3D_CHECK_MINGW64_PROG(variable, crosstarget-variable, [value-if-not-found], [path]) dnl VKD3D_CHECK_MINGW64_PROG(cc-variable, crosstarget-variable, [value-if-not-found], [path])
AC_DEFUN([VKD3D_CHECK_MINGW64_PROG], AC_DEFUN([VKD3D_CHECK_MINGW64_PROG],
[ [AC_SUBST([$2], [$3])
AC_SUBST([$2], [$3])dnl
vkd3d_mingw_list="m4_foreach([vkd3d_mingw_prefix], [pc-mingw32, w64-mingw32, mingw32msvc], 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 ]))" m4_foreach([vkd3d_cpu], [x86_64, amd64], [vkd3d_cpu-vkd3d_mingw_prefix-gcc ]))"
AC_CHECK_PROGS([$1], [$vkd3d_mingw_list], [$3], [$4]) AC_CHECK_PROGS([$1], [$vkd3d_mingw_list], [$3], [$4])
if test "x[$]$1" != x$3 AS_VAR_PUSHDEF([vkd3d_cross_cc], [$1])dnl
then AS_VAR_IF([vkd3d_cross_cc], [$3],
vkd3d_cc_saved="$CC" [],
CC="[$]$1" [vkd3d_cc_saved="$CC"
AC_MSG_CHECKING([whether $CC works]) AS_VAR_COPY([CC], [vkd3d_cross_cc])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], AC_MSG_CHECKING([whether $CC works])
[AC_MSG_RESULT([yes]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
set x [$]$1 [AC_MSG_RESULT([yes])
shift $2=`expr "$CC" : '\(.*\)-gcc'`],
while test "[$]#" -ge 1 [AC_MSG_RESULT([no])])
do CC="$vkd3d_cc_saved"])
case "[$]1" in AS_VAR_POPDEF([vkd3d_cross_cc])dnl
*-gcc) $2=`expr "[$]1" : '\(.*\)-gcc'` ;;
esac
shift
done],
[AC_MSG_RESULT([no])])
CC="$vkd3d_cc_saved"
fi
]) ])