juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-01 07:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

attempt to fix wxwebview undef

Browse Source
This commit is contained in:
Aidan Case
2024-02-22 19:16:16 -06:00
parent 0c9d2675c3
commit caaadbd9d3
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -32,3 +32,4 @@ src/OrcaSlicer-doc/
**/filament_full/ **/filament_full/
/deps/DL_CACHE/ /deps/DL_CACHE/
/deps/DL_CACHE /deps/DL_CACHE
**/.flatpak-builder/

0
flatpak/patches/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch → deps/wxWidgets/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch vendored
View File

4
deps/wxWidgets/wxWidgets.cmake vendored
View File

@@ -23,7 +23,7 @@ else ()
endif () endif ()
if (CMAKE_SYSTEM_NAME STREQUAL "Linux") if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch) set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch ${CMAKE_CURRENT_LIST_DIR}/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch)
endif () endif ()
orcaslicer_add_cmake_project( orcaslicer_add_cmake_project(
@@ -44,6 +44,7 @@ orcaslicer_add_cmake_project(
-DwxUSE_UNICODE=ON -DwxUSE_UNICODE=ON
${_wx_private_font} ${_wx_private_font}
-DwxUSE_OPENGL=ON -DwxUSE_OPENGL=ON
-DwxUSE_WEBREQUEST=ON
-DwxUSE_WEBVIEW=ON -DwxUSE_WEBVIEW=ON
${_wx_edge} ${_wx_edge}
-DwxUSE_WEBVIEW_IE=OFF -DwxUSE_WEBVIEW_IE=OFF
@@ -57,6 +58,7 @@ orcaslicer_add_cmake_project(
-DwxUSE_ZLIB=sys -DwxUSE_ZLIB=sys
-DwxUSE_LIBJPEG=sys -DwxUSE_LIBJPEG=sys
-DwxUSE_LIBTIFF=sys -DwxUSE_LIBTIFF=sys
-DwxUSE_NANOSVG=OFF
-DwxUSE_EXPAT=sys -DwxUSE_EXPAT=sys
) )

2
src/slic3r/GUI/PrinterWebView.hpp
View File

@@ -6,7 +6,7 @@
#include "wx/cmdline.h" #include "wx/cmdline.h"
#include "wx/notifmsg.h" #include "wx/notifmsg.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/webview.h" #include <wx/webview.h>
#include <wx/string.h> #include <wx/string.h>
#if wxUSE_WEBVIEW_EDGE #if wxUSE_WEBVIEW_EDGE

2
src/slic3r/GUI/WebViewDialog.hpp
View File

@@ -6,7 +6,7 @@
#include "wx/cmdline.h" #include "wx/cmdline.h"
#include "wx/notifmsg.h" #include "wx/notifmsg.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/webview.h" #include <wx/webview.h>
#if wxUSE_WEBVIEW_EDGE #if wxUSE_WEBVIEW_EDGE
#include "wx/msw/webview_edge.h" #include "wx/msw/webview_edge.h"