From 784c46ebc79a52917637d16e2d66d00f3fcdcf6f Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sun, 5 Mar 2023 11:03:54 +0100 Subject: [PATCH] Fixed Optick related compile warnings on Linux #750 --- neo/idlib/precompiled.h | 4 +--- neo/libs/optick/optick.config.h | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/neo/idlib/precompiled.h b/neo/idlib/precompiled.h index 90dfe8d3..91bd2fa3 100644 --- a/neo/idlib/precompiled.h +++ b/neo/idlib/precompiled.h @@ -106,9 +106,7 @@ const int MAX_EXPRESSION_REGISTERS = 4096; #endif // RB: make Optick profiling available everywhere -#if defined( USE_OPTICK ) - #include "../libs/optick/optick.h" -#endif +#include "../libs/optick/optick.h" #include "../renderer/Cinematic.h" #include "../renderer/Material.h" diff --git a/neo/libs/optick/optick.config.h b/neo/libs/optick/optick.config.h index 0270bf94..b2d48edc 100644 --- a/neo/libs/optick/optick.config.h +++ b/neo/libs/optick/optick.config.h @@ -33,9 +33,10 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // MASTER SWITCH - use it for disabling profiler in final builds // //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#if !defined(USE_OPTICK) -#define USE_OPTICK (1) -#endif +// RB: only set this through CMakeLists.txt +//#if !defined(USE_OPTICK) +//#define USE_OPTICK (1) +//#endif //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////