diff --git a/src/c/ScriptCmds/HydraConfig.h b/src/c/ScriptCmds/HydraConfig.h index 1f1784ed522b4ddec44736de30eac3f580a90fe6..99d25ff327a79bf469491e12ac61b0b47b1578dd 100644 --- a/src/c/ScriptCmds/HydraConfig.h +++ b/src/c/ScriptCmds/HydraConfig.h @@ -7,6 +7,9 @@ #include <string> #include <algorithm> +#include "ScopedProcessMutex.h" +#include "ScriptIncludes.h" + class HydraConfig { public: @@ -48,11 +51,20 @@ private: } } + // TODO: MRW HACK - this is a pretty nasty way to get config info to user + static void checkConfig(HydraConfig* pInst) + { + if ( pInst->bUseProcessMutex && !SUPPORT_PROCESS_MUTEX() ) + Script::warnMsg("HYDRA_ENABLE_MUTEX set to TRUE but Hydra was compiled without USE_PROCESS_MUTEX flag!\n"); + } + static HydraConfig* initConfig() { HydraConfig* pInst = new HydraConfig(); HydraConfig::loadConfig(pInst); + HydraConfig::checkConfig(pInst); + return pInst; } diff --git a/src/c/ScriptCmds/ScopedProcessMutex.h b/src/c/ScriptCmds/ScopedProcessMutex.h index 2ba632f9da1b00a2becd3082a5c64aef7d6b59ec..8992821a78a6a39cf714587e677156ec1fb3dd5e 100644 --- a/src/c/ScriptCmds/ScopedProcessMutex.h +++ b/src/c/ScriptCmds/ScopedProcessMutex.h @@ -1,8 +1,10 @@ #pragma once #ifdef USE_PROCESS_MUTEX + #define SUPPORT_PROCESS_MUTEX() (1) #define SCOPED_PROCESS_MUTEX(Name) ScopedProcessMutex Name##_mutex(#Name) #else + #define SUPPORT_PROCESS_MUTEX() (0) #define SCOPED_PROCESS_MUTEX(Name) #endif