diff options
| author | Martin Ridgers <[email protected]> | 2022-01-13 15:33:17 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2022-01-13 16:00:08 +0100 |
| commit | 58e84a0eade511222ba92ed8de98909df84c4f5e (patch) | |
| tree | 7eea16d6005229a4d889dc9ea179729dfd086d7b | |
| parent | Do not try to define USE_SENTRY if it's already defined (diff) | |
| download | zen-58e84a0eade511222ba92ed8de98909df84c4f5e.tar.xz zen-58e84a0eade511222ba92ed8de98909df84c4f5e.zip | |
Added ZEN_ prefix to define for consistency
| -rw-r--r-- | xmake.lua | 2 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -82,7 +82,7 @@ option("zensentry") set_showmenu(true) set_description("Enables Sentry support in Zen") option_end() -add_define_by_config("USE_SENTRY", "zensentry") +add_define_by_config("ZEN_USE_SENTRY", "zensentry") option("zenmimalloc") set_default(true) diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index f5e9db6e8..38bb6eae4 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -68,11 +68,11 @@ ZEN_THIRD_PARTY_INCLUDES_END // Sentry // -#if !defined(USE_SENTRY) -# define USE_SENTRY 1 +#if !defined(ZEN_USE_SENTRY) +# define ZEN_USE_SENTRY 1 #endif -#if USE_SENTRY +#if ZEN_USE_SENTRY # define SENTRY_BUILD_STATIC 1 ZEN_THIRD_PARTY_INCLUDES_START # include <sentry.h> @@ -342,7 +342,7 @@ public: ZEN_INFO(ZEN_APP_NAME " now running (pid: {})", zen::GetCurrentProcessId()); -#if USE_SENTRY +#if ZEN_USE_SENTRY ZEN_INFO("sentry crash handler {}", m_UseSentry ? "ENABLED" : "DISABLED"); if (m_UseSentry) { @@ -808,7 +808,7 @@ ZenEntryPoint::ZenEntryPoint(ZenServerOptions& ServerOptions) : m_ServerOptions( int ZenEntryPoint::Run() { -#if USE_SENTRY +#if ZEN_USE_SENTRY if (m_ServerOptions.NoSentry == false) { sentry_options_t* SentryOptions = sentry_options_new(); |