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

feature fix mac os build fail bug.

Browse Source
This commit is contained in:
alves
2026-01-08 15:13:56 +08:00
parent 40f566974c
commit ca7199a0fb
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common_func/common_func.cpp
View File

@@ -120,6 +120,8 @@ namespace common
{ {
std::string localArea = ""; std::string localArea = "";
std::string cfgfile = ""; std::string cfgfile = "";
std::string versionFilePath = "";
#ifdef _WIN32 #ifdef _WIN32
PWSTR pszPath = nullptr; PWSTR pszPath = nullptr;
@@ -137,7 +139,7 @@ namespace common
#elif __APPLE__ #elif __APPLE__
const char* home_env = getenv("HOME"); const char* home_env = getenv("HOME");
cfgfile = home_env; versionFilePath = home_env;
cfgfile = versionFilePath + "/Library/Application Support/Snapmaker_Orca/Snapmaker_Orca.conf"; cfgfile = versionFilePath + "/Library/Application Support/Snapmaker_Orca/Snapmaker_Orca.conf";
#else #else
@@ -160,7 +162,7 @@ namespace common
std::string getLanguage() std::string getLanguage()
{ {
std::string localLanguage = ""; std::string localLanguage = "";
std::string versionFilePath = "";
std::string cfgfile = ""; std::string cfgfile = "";
#ifdef _WIN32 #ifdef _WIN32
@@ -179,7 +181,7 @@ namespace common
#elif __APPLE__ #elif __APPLE__
const char* home_env = getenv("HOME"); const char* home_env = getenv("HOME");
cfgfile = home_env; versionFilePath = home_env;
cfgfile = versionFilePath + "/Library/Application Support/Snapmaker_Orca/Snapmaker_Orca.conf"; cfgfile = versionFilePath + "/Library/Application Support/Snapmaker_Orca/Snapmaker_Orca.conf";
#else #else

22
src/sentry_wrapper/SentryWrapper.cpp
View File

@@ -313,31 +313,35 @@ void sentryReportLogEx(SENTRY_LOG_LEVEL logLevel,
sentry_value_set_by_key(tags, "local_area", attr); sentry_value_set_by_key(tags, "local_area", attr);
} }
switch (logLevel) { switch (logLevel) {
case SENTRY_LOG_TRACE: case SENTRY_LOG_TRACE: {
sentry_msg_level = SENTRY_LEVEL_TRACE; sentry_msg_level = SENTRY_LEVEL_TRACE;
sentry_value_t attr = sentry_value_new_attribute(sentry_value_new_string("snapmaker_bury_point"), NULL); sentry_value_t attr = sentry_value_new_attribute(sentry_value_new_string("snapmaker_bury_point"), NULL);
sentry_value_set_by_key(tags, BURY_POINT, attr); sentry_value_set_by_key(tags, BURY_POINT, attr);
sentry_log_trace(logContent.c_str(), tags); sentry_log_trace(logContent.c_str(), tags);
break; } break;
case SENTRY_LOG_DEBUG: case SENTRY_LOG_DEBUG: {
sentry_msg_level = SENTRY_LEVEL_DEBUG; sentry_msg_level = SENTRY_LEVEL_DEBUG;
sentry_log_debug(logContent.c_str(), tags); sentry_log_debug(logContent.c_str(), tags);
break; } break;
case SENTRY_LOG_INFO: case SENTRY_LOG_INFO: {
sentry_msg_level = SENTRY_LEVEL_INFO; sentry_msg_level = SENTRY_LEVEL_INFO;
sentry_log_info(logContent.c_str(), tags); sentry_log_info(logContent.c_str(), tags);
break; } break;
case SENTRY_LOG_WARNING: case SENTRY_LOG_WARNING: {
sentry_msg_level = SENTRY_LEVEL_WARNING; sentry_msg_level = SENTRY_LEVEL_WARNING;
sentry_log_warn(logContent.c_str(), tags); sentry_log_warn(logContent.c_str(), tags);
break; } break;
case SENTRY_LOG_ERROR: case SENTRY_LOG_ERROR:
{
sentry_msg_level = SENTRY_LEVEL_ERROR; sentry_msg_level = SENTRY_LEVEL_ERROR;
sentry_log_error(logContent.c_str(), tags); sentry_log_error(logContent.c_str(), tags);
}
break; break;
case SENTRY_LOG_FATAL: case SENTRY_LOG_FATAL:
{
sentry_msg_level = SENTRY_LEVEL_FATAL; sentry_msg_level = SENTRY_LEVEL_FATAL;
sentry_log_fatal(logContent.c_str(), tags); sentry_log_fatal(logContent.c_str(), tags);
}
break; break;
default: return; default: return;
} }