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

Merge remote-tracking branch 'remotes/origin/2.2.0' into dev_snapmaker_2.2.0_beta2_alves

Browse Source 
# Conflicts:
#	CMakeLists.txt
#	deps/Sentry/Sentry.cmake
#	src/sentry_wrapper/SentryWrapper.cpp
#	src/sentry_wrapper/SentryWrapper.hpp
This commit is contained in:
alves
2025-12-08 18:27:32 +08:00
parent 2651718c13 ccae13b98b
commit 191ef10339
19 changed files with 303079 additions and 160008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deps/CMakeLists.txt vendored
View File

@@ -62,6 +62,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
endif()
# Sentry crash reporting - enabled only on Windows by default
if (WIN32)
set(SLIC3R_SENTRY_DEFAULT ON)
else()
set(SLIC3R_SENTRY_DEFAULT OFF)
endif()
option(SLIC3R_SENTRY "Enable Sentry crash reporting SDK" ${SLIC3R_SENTRY_DEFAULT})
set(IS_CROSS_COMPILE FALSE)
if (APPLE)