diff --git a/advancedSettings.pro b/advancedSettings.pro index 9458a0f..9f1970a 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -7,6 +7,8 @@ QT += core gui qml quick multimedia widgets CONFIG += c++11 +DEFINES += ELPP_THREAD_SAFE ELPP_QT_LOGGING ELPP_NO_DEFAULT_LOG_FILE + lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5.6 or higher") lessThan(QT_MINOR_VERSION, 6): error("requires Qt 5.6 or higher") diff --git a/src/logging.h b/src/logging.h index 5a8dd38..486f02d 100644 --- a/src/logging.h +++ b/src/logging.h @@ -1,16 +1,4 @@ #pragma once // easylogging includes -#ifndef _DEBUG -# define _DEBUG -# define ELPP_THREAD_SAFE -# define ELPP_QT_LOGGING -# define ELPP_NO_DEFAULT_LOG_FILE -# include -# undef _DEBUG -#else -# define ELPP_THREAD_SAFE -# define ELPP_QT_LOGGING -# define ELPP_NO_DEFAULT_LOG_FILE -# include -#endif +#include