Disable wxMediaCtrl and wxWebView when OLE is disabled in wxMSW
Avoid errors in wx/msw/chkconf.h during compilation by proactively turning these options off in configure if wxUSE_OLE==0.
This commit is contained in:
14
configure
vendored
14
configure
vendored
@@ -35450,9 +35450,21 @@ if test "$USE_WIN32" = 1 ; then
|
||||
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
|
||||
else
|
||||
wxUSE_CLIPBOARD=no
|
||||
wxUSE_CLIPBOARD=no
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
wxUSE_DATAOBJ=no
|
||||
|
||||
if test "$wxUSE_MEDIACTRL" = "yes"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMediaCtrl requires wxUSE_OLE... disabled" >&5
|
||||
$as_echo "$as_me: WARNING: wxMediaCtrl requires wxUSE_OLE... disabled" >&2;}
|
||||
wxUSE_MEDIACTRL=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_WEBVIEW" = "yes"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxWebView requires wxUSE_OLE... disabled" >&5
|
||||
$as_echo "$as_me: WARNING: wxWebView requires wxUSE_OLE... disabled" >&2;}
|
||||
wxUSE_WEBVIEW=no
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
12
configure.in
12
configure.in
@@ -6526,9 +6526,21 @@ if test "$USE_WIN32" = 1 ; then
|
||||
AC_DEFINE(wxUSE_ACTIVEX)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
|
||||
else
|
||||
dnl Turn off features depending on OLE directly...
|
||||
wxUSE_CLIPBOARD=no
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
wxUSE_DATAOBJ=no
|
||||
|
||||
dnl ... or indirectly (via wxUSE_ACTIVEX)
|
||||
if test "$wxUSE_MEDIACTRL" = "yes"; then
|
||||
AC_MSG_WARN(wxMediaCtrl requires wxUSE_OLE... disabled)
|
||||
wxUSE_MEDIACTRL=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_WEBVIEW" = "yes"; then
|
||||
AC_MSG_WARN(wxWebView requires wxUSE_OLE... disabled)
|
||||
wxUSE_WEBVIEW=no
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
Reference in New Issue
Block a user