mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-04-06 00:32:05 +02:00
Update build system for wxWidgets 3.1.5 → 3.3.2 upgrade
- deps/wxWidgets/wxWidgets.cmake: Add GIT_TAG v3.3.2 to track the correct branch; remove -DwxUSE_UNICODE=ON (unicode-only in 3.3, option removed) - src/CMakeLists.txt: Bump find_package minimum version from 3.0/3.1 to 3.3; remove SLIC3R_WX_STABLE conditional (3.0 no longer supported) - CMakeLists.txt: Remove SLIC3R_WX_STABLE option definition - scripts/flatpak/com.orcaslicer.OrcaSlicer.yml: Update wxWidgets source URL to v3.3.2 branch archive; remove sha256 (placeholder TODO); remove -DwxUSE_UNICODE=ON
This commit is contained in:
@@ -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)
|
||||
|
||||
2
deps/wxWidgets/wxWidgets.cmake
vendored
2
deps/wxWidgets/wxWidgets.cmake
vendored
@@ -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
|
||||
|
||||
@@ -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: <placeholder>
|
||||
|
||||
# OrcaSlicer C++ dependencies (built offline with pre-downloaded archives)
|
||||
- name: orca_deps
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user