Add --enable-webviewedge to configure
It is disabled by default, just like other build systems. Add -Wno-unknown-pragmas to the configure build too.
This commit is contained in:
Maarten Bent
parent
ae695b8b57
commit
665692f6a8
13
Makefile.in
13
Makefile.in
@ -1002,7 +1002,7 @@ MONODLL_CXXFLAGS = $(__monodll_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
|
||||
-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \
|
||||
-DLINK_LEXERS $(__webview_additional_include_wrl_p) \
|
||||
$(__webview_additional_include_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) \
|
||||
$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
||||
$(WX_CXXFLAGS) $(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS)
|
||||
MONODLL_OBJCXXFLAGS = $(__monodll_PCH_INC) $(__INC_TIFF_BUILD_p) \
|
||||
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
||||
$(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
|
||||
@ -1150,8 +1150,8 @@ MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
|
||||
-I$(top_srcdir)/src/stc/scintilla/lexlib \
|
||||
-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \
|
||||
-DLINK_LEXERS $(__webview_additional_include_wrl_p) \
|
||||
$(__webview_additional_include_p) -DwxUSE_BASE=1 $(WX_CXXFLAGS) $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
$(__webview_additional_include_p) -DwxUSE_BASE=1 $(WX_CXXFLAGS) \
|
||||
$(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS)
|
||||
MONOLIB_OBJCXXFLAGS = $(__monolib_PCH_INC) $(__INC_TIFF_BUILD_p) \
|
||||
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
||||
$(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
|
||||
@ -1736,8 +1736,8 @@ WEBVIEWDLL_CXXFLAGS = $(__webviewdll_PCH_INC) $(__INC_TIFF_BUILD_p) \
|
||||
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
|
||||
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING \
|
||||
$(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \
|
||||
-DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
-DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW $(PIC_FLAG) $(WX_CXXFLAGS) \
|
||||
$(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS)
|
||||
WEBVIEWDLL_OBJCXXFLAGS = $(__webviewdll_PCH_INC) $(__INC_TIFF_BUILD_p) \
|
||||
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
||||
$(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
|
||||
@ -1758,7 +1758,7 @@ WEBVIEWLIB_CXXFLAGS = $(__webviewlib_PCH_INC) $(__INC_TIFF_BUILD_p) \
|
||||
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
|
||||
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING \
|
||||
$(__webview_additional_include_wrl_p) $(__webview_additional_include_p) \
|
||||
$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
||||
$(WX_CXXFLAGS) $(webview_edge_pragma_warning) $(CPPFLAGS) $(CXXFLAGS)
|
||||
WEBVIEWLIB_OBJCXXFLAGS = $(__webviewlib_PCH_INC) $(__INC_TIFF_BUILD_p) \
|
||||
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
||||
$(__INC_REGEX_p) $(__INC_EXPAT_p) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
|
||||
@ -2297,6 +2297,7 @@ COND_USE_STC_1___wxscintilla___depname = \
|
||||
@COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
||||
@COND_TOOLKIT_MSW@webview_edge_pragma_warning = -Wno-unknown-pragmas
|
||||
@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = $(WX_VERSION_NODOT)
|
||||
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
|
||||
@COND_PLATFORM_UNIX_0@PLUGVERDELIM =
|
||||
|
||||
@ -825,7 +825,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
|
||||
<include>$(webview_additional_include_wrl)</include>
|
||||
<include>$(webview_additional_include)</include>
|
||||
<lib-path>$(webview_additional_libdirs)</lib-path>
|
||||
<cxxflags-mingw>$(webview_edge_pragma_warning)</cxxflags-mingw>
|
||||
<cxxflags>$(webview_edge_pragma_warning)</cxxflags>
|
||||
</template>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
|
||||
37
configure
vendored
37
configure
vendored
@ -1377,6 +1377,7 @@ enable_ownerdrawn
|
||||
enable_uxtheme
|
||||
enable_wxdib
|
||||
enable_webviewie
|
||||
enable_webviewedge
|
||||
enable_autoidman
|
||||
enable_largefile
|
||||
enable_gtktest
|
||||
@ -2348,6 +2349,7 @@ Optional Features:
|
||||
--enable-uxtheme enable support for Windows XP themed look (Win32 only)
|
||||
--enable-wxdib use wxDIB class (Win32 only)
|
||||
--enable-webviewie use wxWebView IE backend (Win32 only)
|
||||
--enable-webviewedge use wxWebView Edge backend (Win32 only)
|
||||
--enable-autoidman use automatic ids management
|
||||
--disable-largefile omit support for large files
|
||||
--disable-gtktest do not try to compile and run a test GTK+ program
|
||||
@ -4142,6 +4144,7 @@ DEFAULT_wxUSE_HOTKEY=auto
|
||||
DEFAULT_wxUSE_MEDIACTRL=auto
|
||||
DEFAULT_wxUSE_METAFILE=auto
|
||||
DEFAULT_wxUSE_OPENGL=auto
|
||||
DEFAULT_wxUSE_WEBVIEW_EDGE=no
|
||||
|
||||
DEFAULT_wxUSE_UNIVERSAL_BINARY=no
|
||||
DEFAULT_wxUSE_MAC_ARCH=no
|
||||
@ -12935,6 +12938,35 @@ fi
|
||||
eval "$wx_cv_use_webviewie"
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
if test x"$enablestring" = xdisable; then
|
||||
defaultval=yes
|
||||
else
|
||||
defaultval=no
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check whether --enable-webviewedge was given.
|
||||
if test "${enable_webviewedge+set}" = set; then :
|
||||
enableval=$enable_webviewedge;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_webviewedge='wxUSE_WEBVIEW_EDGE=yes'
|
||||
else
|
||||
wx_cv_use_webviewedge='wxUSE_WEBVIEW_EDGE=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
wx_cv_use_webviewedge='wxUSE_WEBVIEW_EDGE=${'DEFAULT_wxUSE_WEBVIEW_EDGE":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_webviewedge"
|
||||
|
||||
|
||||
if test "$wxUSE_MSW" != 1; then
|
||||
DEFAULT_wxUSE_AUTOID_MANAGEMENT=no
|
||||
fi
|
||||
@ -41831,6 +41863,11 @@ $as_echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;}
|
||||
$as_echo "#define wxUSE_WEBVIEW_IE 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
if test "$wxUSE_WEBVIEW_EDGE" = "yes"; then
|
||||
wxUSE_WEBVIEW="yes"
|
||||
$as_echo "#define wxUSE_WEBVIEW_EDGE 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -354,6 +354,7 @@ DEFAULT_wxUSE_HOTKEY=auto
|
||||
DEFAULT_wxUSE_MEDIACTRL=auto
|
||||
DEFAULT_wxUSE_METAFILE=auto
|
||||
DEFAULT_wxUSE_OPENGL=auto
|
||||
DEFAULT_wxUSE_WEBVIEW_EDGE=no
|
||||
|
||||
dnl Mac/Cocoa users need to enable building universal binaries explicitly
|
||||
DEFAULT_wxUSE_UNIVERSAL_BINARY=no
|
||||
@ -1066,6 +1067,7 @@ WX_ARG_FEATURE(ownerdrawn, [ --enable-ownerdrawn use owner drawn controls
|
||||
WX_ARG_FEATURE(uxtheme, [ --enable-uxtheme enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME)
|
||||
WX_ARG_FEATURE(wxdib, [ --enable-wxdib use wxDIB class (Win32 only)], wxUSE_DIB)
|
||||
WX_ARG_FEATURE(webviewie, [ --enable-webviewie use wxWebView IE backend (Win32 only)], wxUSE_WEBVIEW_IE)
|
||||
WX_ARG_FEATURE(webviewedge, [ --enable-webviewedge use wxWebView Edge backend (Win32 only)], wxUSE_WEBVIEW_EDGE)
|
||||
|
||||
dnl this one is not really MSW-specific but it exists mainly to be turned off
|
||||
dnl under MSW, it should be off by default on the other platforms
|
||||
@ -7523,6 +7525,10 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
|
||||
wxUSE_WEBVIEW="yes"
|
||||
AC_DEFINE(wxUSE_WEBVIEW_IE)
|
||||
fi
|
||||
if test "$wxUSE_WEBVIEW_EDGE" = "yes"; then
|
||||
wxUSE_WEBVIEW="yes"
|
||||
AC_DEFINE(wxUSE_WEBVIEW_EDGE)
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user