cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include <windows.h> in tests for multimon.h, ddraw.h and dshow.h as otherwise they don't risk to work (closes 1083808)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-12-12 11:01:39 +00:00
parent 3ea9aa8f0e
commit dc9dadac18
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure.in
View File

@ -3201,10 +3201,12 @@ dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
dnl DirectDraw / Multimon for MSW
dnl ---------------------------------------------------------------------------
AC_CHECK_HEADERS([multimon.h ddraw.h], [], [
wxUSE_DISPLAY="no"
AC_MSG_WARN([ddraw.h or multimon.h not found; disabling wxDisplay])
] )
AC_CHECK_HEADERS([multimon.h ddraw.h], [],
[
wxUSE_DISPLAY="no"
AC_MSG_WARN([ddraw.h or multimon.h not found; disabling wxDisplay])
],
[#include <windows.h>])
fi
fi
@ -3218,17 +3220,19 @@ dnl ---------------------------------------------------------------------------
dnl DirectShow MSW
dnl ---------------------------------------------------------------------------
wxUSE_DIRECTSHOW="yes"
AC_CHECK_HEADERS([dshow.h], [], [
wxUSE_DIRECTSHOW="no"
AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher])
] )
AC_CHECK_HEADERS([dshow.h], [],
[
wxUSE_DIRECTSHOW="no"
AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher])
],
[#include <windows.h>])
if test "$wxUSE_DIRECTSHOW" = "yes"; then
AC_DEFINE(wxUSE_DIRECTSHOW)
LIBS="$LIBS -lstrmiids"
AC_DEFINE(wxUSE_DIRECTSHOW)
LIBS="$LIBS -lstrmiids"
fi
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
AC_DEFINE(wxUSE_MEDIACTRL)
fi