Skip to content

V
vlc-1.1
Commit caa99b31 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

More WIN32 portability fixes.

parent cb700a8d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 144 deletions
configure
View file @ caa99b31
This diff is collapsed.
configure.in
View file @ caa99b31
......@@ -934,51 +934,33 @@ dnl
dnl Windows DirectX module
dnl
AC_ARG_ENABLE(directx,
[ --disable-directx Windows DirectX support (default enabled on WIN32)],
[ if test "x$enableval" != "xno"
then
if test "x$enableval" = "xyes"
then
AC_CHECK_HEADERS(directx.h,
[ PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-lgdi32 -ldxguid" ] )
else
AC_MSG_CHECKING(for directX headers in ${enableval})
if test -f ${enableval}/include/directx.h
then
PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-L${enableval}/lib -lgdi32 -ldxguid"
INCLUDE="${INCLUDE} -I${enableval}/include"
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_MSG_ERROR([Cannot find ${enableval}/include/directx.h!])
fi
fi
fi ],
[ if test $SYS = mingw32
[ --disable-directx Windows DirectX support (default enabled on WIN32)])
if test "x$enableval" != "xno"
then
if test $SYS = mingw32
then
AC_ARG_WITH(directx-path,
[ --with-directx-path=path Windows DirectX headers and libraries])
if test "x$with_directx_path" = "x"
then
AC_ARG_WITH(directx-path,
[ --with-directx-path=path Windows DirectX headers and libraries])
if test "x$with_directx_path" = "x"
AC_CHECK_HEADERS(directx.h,
[ PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-lgdi32 -ldxguid" ])
else
AC_MSG_CHECKING(for directX headers in ${withval})
if test -f ${withval}/include/directx.h
then
AC_CHECK_HEADERS(directx.h,
[ PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-lgdi32 -ldxguid" ])
PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-L${withval}/lib -lgdi32 -ldxguid"
INCLUDE="${INCLUDE} -I${withval}/include"
AC_MSG_RESULT(yes)
else
AC_MSG_CHECKING(for directX headers in ${withval})
if test -f ${with_directx_path}/include/directx.h
then
PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-L${with_directx_path}/lib -lgdi32 -ldxguid"
INCLUDE="${INCLUDE} -I${with_directx_path}/include"
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_MSG_ERROR([Cannot find ${with_directx_path}/include/directx.h!])
fi
AC_MSG_RESULT(no)
AC_MSG_ERROR([Cannot find ${withval}/include/directx.h!])
fi
fi ])
fi
fi
fi
dnl
dnl Glide module
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment