diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl index 05eafd756a..90ca606d72 100644 --- a/build/bakefiles/multilib.bkl +++ b/build/bakefiles/multilib.bkl @@ -184,6 +184,10 @@ $(TOP_SRCDIR)include/wx/msw/wrl + + -Wno-unknown-pragmas + + WXUSINGDLL @@ -195,6 +199,7 @@ $(WEBVIEW_HDR) $(webview_additional_include_wrl) $(webview_additional_include) + $(webview_edge_pragma_warning) $(WEBVIEW_HDR) $(webview_additional_include_wrl) $(webview_additional_include) + $(webview_edge_pragma_warning) diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt index 4cbf0fd900..e2ddeb44fb 100644 --- a/build/cmake/lib/webview/CMakeLists.txt +++ b/build/cmake/lib/webview/CMakeLists.txt @@ -69,6 +69,7 @@ elseif(WXMSW) wx_lib_include_directories(wxwebview PRIVATE "${WEBVIEW2_PACKAGE_DIR}/build/native/include") if(NOT MSVC) wx_lib_include_directories(wxwebview PRIVATE "${wxSOURCE_DIR}/include/wx/msw/wrl") + target_compile_options(wxwebview PRIVATE -Wno-unknown-pragmas) endif() if (CMAKE_SIZEOF_VOID_P EQUAL 4) diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 574f068211..6ff7d9af53 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1142,7 +1142,8 @@ WEBVIEWDLL_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING -DWXUSINGDLL \ -DWXMAKINGDLL_WEBVIEW -I..\..\include\wx\msw\wrl \ -I..\..\3rdparty\webview2\build\native\include $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy -Wno-unknown-pragmas $(CPPFLAGS) \ + $(CXXFLAGS) WEBVIEWDLL_OBJECTS = \ $(OBJS)\webviewdll_dummy.o \ $(OBJS)\webviewdll_webview_ie.o \ @@ -1159,8 +1160,8 @@ WEBVIEWLIB_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\include\wx\msw\wrl -I..\..\3rdparty\webview2\build\native\include \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + -Wno-unknown-pragmas $(CPPFLAGS) $(CXXFLAGS) WEBVIEWLIB_OBJECTS = \ $(OBJS)\webviewlib_dummy.o \ $(OBJS)\webviewlib_webview_ie.o \