mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-17 10:32:20 +00:00
fix Windows build errors - wip
This commit is contained in:
@@ -32,14 +32,16 @@ if (SLIC3R_GUI)
|
||||
set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}")
|
||||
find_package(wxWidgets 3.3 REQUIRED COMPONENTS base core adv html gl aui net media webview)
|
||||
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 ()
|
||||
|
||||
if(UNIX)
|
||||
message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}")
|
||||
endif()
|
||||
|
||||
include(${wxWidgets_USE_FILE})
|
||||
if(wxWidgets_USE_FILE)
|
||||
include(${wxWidgets_USE_FILE})
|
||||
endif()
|
||||
|
||||
find_package(JPEG QUIET)
|
||||
|
||||
|
||||
@@ -329,7 +329,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
|
||||
bool WebView::CheckWebViewRuntime()
|
||||
{
|
||||
wxWebViewFactoryEdge factory;
|
||||
auto wxVersion = factory.GetVersionInfo();
|
||||
auto wxVersion = factory.GetVersionInfo(wxVersionContext::RunTime);
|
||||
return wxVersion.GetMajor() != 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user