GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-11 16:29:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wxWidgest are updated for v.3.2.6

Browse Source 
+ Fixed compilation issues
+ Disable libpng compilation on linux
This commit is contained in:
YuSanka 2025-01-14 18:37:04 +01:00 committed by Lukas Matena
parent 9ba6541a89
commit ee98a1c31b
5 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
deps/+PNG/PNG.cmake vendored
View File

@ -1,27 +1,29 @@
if (APPLE) if (MSVC OR APPLE)
# Only disable NEON extension for Apple ARM builds, leave it enabled for Raspberry PI. if (APPLE)
set(_disable_neon_extension "-DPNG_ARM_NEON:STRING=off") # Only disable NEON extension for Apple ARM builds, leave it enabled for Raspberry PI.
else () set(_disable_neon_extension "-DPNG_ARM_NEON:STRING=off")
set(_disable_neon_extension "") else ()
endif () set(_disable_neon_extension "")
endif ()
set(_patch_cmd PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.patched CMakeLists.txt) set(_patch_cmd PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.patched CMakeLists.txt)
if (APPLE) if (APPLE)
set(_patch_cmd ${_patch_cmd} && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch) set(_patch_cmd ${_patch_cmd} && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch)
endif () endif ()
add_cmake_project(PNG add_cmake_project(PNG
URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.35.zip URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.35.zip
URL_HASH SHA256=3d22d46c566b1761a0e15ea397589b3a5f36ac09b7c785382e6470156c04247f URL_HASH SHA256=3d22d46c566b1761a0e15ea397589b3a5f36ac09b7c785382e6470156c04247f
PATCH_COMMAND "${_patch_cmd}" PATCH_COMMAND "${_patch_cmd}"
CMAKE_ARGS CMAKE_ARGS
-DPNG_SHARED=OFF -DPNG_SHARED=OFF
-DPNG_STATIC=ON -DPNG_STATIC=ON
-DPNG_PREFIX=prusaslicer_ -DPNG_PREFIX=prusaslicer_
-DPNG_TESTS=OFF -DPNG_TESTS=OFF
-DPNG_EXECUTABLES=OFF -DPNG_EXECUTABLES=OFF
${_disable_neon_extension} ${_disable_neon_extension}
) )
set(DEP_PNG_DEPENDS ZLIB) set(DEP_PNG_DEPENDS ZLIB)
endif()

2
deps/+wxWidgets/webview.patch vendored
View File

@ -11,5 +11,5 @@ diff -ur build.orig/cmake/lib/webview/CMakeLists.txt build/cmake/lib/webview/CMa
- set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d") - set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d")
+ set(WEBVIEW2_SHA256 "805c79e05184fab18c9fe7b8ba820c598399b97adc1fbf5b0ea490efad91d5b8") + set(WEBVIEW2_SHA256 "805c79e05184fab18c9fe7b8ba820c598399b97adc1fbf5b0ea490efad91d5b8")
set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}") set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}")

4
deps/+wxWidgets/wxWidgets.cmake vendored
View File

@ -28,8 +28,8 @@ else ()
endif () endif ()
add_cmake_project(wxWidgets add_cmake_project(wxWidgets
URL https://github.com/prusa3d/wxWidgets/archive/323a465e577e03f330e2e6a4c78e564d125340cb.zip URL https://github.com/prusa3d/wxWidgets/archive/5462e7d7cfac645926188443e842171e107b312c.zip
URL_HASH SHA256=B538E4AD3CC93117932F4DED70C476D6650F9C70A9D4055A08F3693864C47465 URL_HASH SHA256=3EBB971DDB45CEEA6D9B965C3D0266F44EDAE71F2A7DAA5D48DB34BD95AA878B
PATCH_COMMAND COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/webview.patch PATCH_COMMAND COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/webview.patch
CMAKE_ARGS CMAKE_ARGS
"-DCMAKE_DEBUG_POSTFIX:STRING=" "-DCMAKE_DEBUG_POSTFIX:STRING="

3
src/slic3r/GUI/PhysicalPrinterDialog.cpp
View File

@ -608,7 +608,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
// Always fill in the "printhost_port" combo box from the config and select it. // Always fill in the "printhost_port" combo box from the config and select it.
{ {
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port")); Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
choice->set_values({ m_config->opt_string("printhost_port") }); const std::vector<std::string> ports = { m_config->opt_string("printhost_port") };
choice->set_values(ports);
choice->set_selection(); choice->set_selection();
} }

3
src/slic3r/GUI/Plater.cpp
View File

@ -4393,7 +4393,8 @@ void Plater::load_project(const wxString& filename)
s_multiple_beds.set_loading_project_flag(true); s_multiple_beds.set_loading_project_flag(true);
ScopeGuard guard([](){ s_multiple_beds.set_loading_project_flag(false);}); ScopeGuard guard([](){ s_multiple_beds.set_loading_project_flag(false);});
if (! load_files({ into_path(filename) }).empty()) { const std::vector<fs::path>& input_paths = { into_path(filename) };
if (! load_files(input_paths).empty()) {
// At least one file was loaded. // At least one file was loaded.
p->set_project_filename(filename); p->set_project_filename(filename);
// Save the names of active presets and project specific config into ProjectDirtyStateManager. // Save the names of active presets and project specific config into ProjectDirtyStateManager.