diff --git a/CMakeLists.txt b/CMakeLists.txt index af78323a15..88cb23129e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,6 @@ endif() option(SLIC3R_STATIC "Compile OrcaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL}) option(SLIC3R_GUI "Compile OrcaSlicer with GUI components (OpenGL, wxWidgets)" 1) option(SLIC3R_FHS "Assume OrcaSlicer is to be installed in a FHS directory structure" 0) -option(SLIC3R_WX_STABLE "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0) option(SLIC3R_PROFILE "Compile OrcaSlicer with an invasive Shiny profiler" 0) option(SLIC3R_PCH "Use precompiled headers" 1) option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1) diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index e1c40cc287..9fe1ec554f 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -32,6 +32,7 @@ endif() orcaslicer_add_cmake_project( wxWidgets GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets" + GIT_TAG v3.3.2 GIT_SHALLOW ON DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG} CMAKE_ARGS @@ -44,7 +45,6 @@ orcaslicer_add_cmake_project( ${_wx_shared} -DwxUSE_MEDIACTRL=ON -DwxUSE_DETECT_SM=OFF - -DwxUSE_UNICODE=ON -DwxUSE_PRIVATE_FONTS=ON -DwxUSE_OPENGL=ON -DwxUSE_GLCANVAS_EGL=OFF diff --git a/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml b/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml index ba856cae2c..7af9cc6792 100644 --- a/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml +++ b/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml @@ -97,7 +97,6 @@ modules: - -DBUILD_SHARED_LIBS=ON - -DwxUSE_MEDIACTRL=ON - -DwxUSE_DETECT_SM=OFF - - -DwxUSE_UNICODE=ON - -DwxUSE_PRIVATE_FONTS=ON - -DwxUSE_OPENGL=ON - -DwxUSE_GLCANVAS_EGL=OFF @@ -120,8 +119,9 @@ modules: - -DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld sources: - type: archive - url: https://github.com/SoftFever/Orca-deps-wxWidgets/archive/refs/tags/orca-3.1.5-1.tar.gz - sha256: 1dc9d3865d899cb71c27a7e549aa5491e832ef6e81a7b6653ccb11f9c37fa99d + url: https://github.com/SoftFever/Orca-deps-wxWidgets/archive/refs/heads/v3.3.2.tar.gz + # TODO: compute sha256 after the v3.3.2 branch archive is available + # sha256: # OrcaSlicer C++ dependencies (built offline with pre-downloaded archives) - name: orca_deps diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 268d60d2df..bc6c60aa3c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,13 +30,9 @@ if (SLIC3R_GUI) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}") - if (SLIC3R_WX_STABLE) - find_package(wxWidgets 3.0 REQUIRED COMPONENTS base core adv html gl aui net media webview) - else () - find_package(wxWidgets 3.1 REQUIRED COMPONENTS base core adv html gl aui net media webview) - endif () + find_package(wxWidgets 3.3 REQUIRED COMPONENTS base core adv html gl aui net media webview) else () - find_package(wxWidgets 3.1 REQUIRED COMPONENTS html adv gl core base webview aui net media) + find_package(wxWidgets 3.3 REQUIRED COMPONENTS html adv gl core base webview aui net media) endif () if(UNIX)