juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 00:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Windows build errors - wip

Browse Source
This commit is contained in:
SoftFever
2026-03-26 10:17:19 +08:00
parent 67fb0c8c83
commit fd47370c5c
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
deps/wxWidgets/wxWidgets.cmake vendored
View File

@@ -59,12 +59,23 @@ orcaslicer_add_cmake_project(
# wxWidgets 3.3 cmake install doesn't include private headers. # wxWidgets 3.3 cmake install doesn't include private headers.
# OrcaSlicer uses some of the private headers (for accessibility support). # OrcaSlicer uses some of the private headers (for accessibility support).
# Copy the private headers directory after install. # Copy the private headers directory after install.
if(MSVC)
set(_wx_inc_dest ${DESTDIR}/include/wx)
else()
set(_wx_inc_dest ${DESTDIR}/include/wx-3.3/wx)
endif()
ExternalProject_Add_Step(dep_wxWidgets copy_private_headers ExternalProject_Add_Step(dep_wxWidgets copy_private_headers
DEPENDEES install DEPENDEES install
COMMENT "Copying wxWidgets private headers" COMMENT "Copying wxWidgets private headers"
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory
<SOURCE_DIR>/include/wx/private <SOURCE_DIR>/include/wx/private
${DESTDIR}/include/wx-3.3/wx/private ${_wx_inc_dest}/private
COMMAND ${CMAKE_COMMAND} -E copy_directory
<SOURCE_DIR>/include/wx/generic/private
${_wx_inc_dest}/generic/private
COMMAND ${CMAKE_COMMAND} -E copy_directory
<SOURCE_DIR>/include/wx/gtk/private
${_wx_inc_dest}/gtk/private
) )
if (MSVC) if (MSVC)

6
src/CMakeLists.txt
View File

@@ -32,14 +32,16 @@ if (SLIC3R_GUI)
set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}") set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}")
find_package(wxWidgets 3.3 REQUIRED COMPONENTS base core adv html gl aui net media webview) find_package(wxWidgets 3.3 REQUIRED COMPONENTS base core adv html gl aui net media webview)
else () else ()
find_package(wxWidgets 3.3 REQUIRED COMPONENTS html adv gl core base webview aui net media) find_package(wxWidgets 3.3 CONFIG REQUIRED COMPONENTS html adv gl core base webview aui net media)
endif () endif ()
if(UNIX) if(UNIX)
message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}") message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}")
endif() endif()
include(${wxWidgets_USE_FILE}) if(wxWidgets_USE_FILE)
include(${wxWidgets_USE_FILE})
endif()
find_package(JPEG QUIET) find_package(JPEG QUIET)

2
src/slic3r/GUI/Widgets/WebView.cpp
View File

@@ -329,7 +329,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
bool WebView::CheckWebViewRuntime() bool WebView::CheckWebViewRuntime()
{ {
wxWebViewFactoryEdge factory; wxWebViewFactoryEdge factory;
auto wxVersion = factory.GetVersionInfo(); auto wxVersion = factory.GetVersionInfo(wxVersionContext::RunTime);
return wxVersion.GetMajor() != 0; return wxVersion.GetMajor() != 0;
} }