From 5c70aba09838971585c40a6364abc3c2c3cb5ffa Mon Sep 17 00:00:00 2001 From: Vasily Date: Sun, 17 Feb 2019 21:34:46 +0100 Subject: [PATCH] Revert easylogging++ include and attempt changing easylogging++.cc --- build_scripts/qt/sources.pri | 9 +++------ third-party/easylogging++/easylogging++.cc | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build_scripts/qt/sources.pri b/build_scripts/qt/sources.pri index 0ab72b8..ff02bf9 100644 --- a/build_scripts/qt/sources.pri +++ b/build_scripts/qt/sources.pri @@ -63,9 +63,6 @@ win32-clang-msvc { QMAKE_CXXFLAGS += -isystem ../third-party/openvr/headers QMAKE_CXXFLAGS += -isystem ../third-party/easylogging++ } -!*gcc* { - # easylogging++ used to be a header only lib. Now requires easylogging++.cc - SOURCES += third-party/easylogging++/easylogging++.cc -} else { - QMAKE_CXXFLAGS += -i ../third-party/easylogging++ -} + +# easylogging++ used to be a header only lib. Now requires easylogging++.cc +SOURCES += third-party/easylogging++/easylogging++.cc diff --git a/third-party/easylogging++/easylogging++.cc b/third-party/easylogging++/easylogging++.cc index d763ee7..04b6492 100644 --- a/third-party/easylogging++/easylogging++.cc +++ b/third-party/easylogging++/easylogging++.cc @@ -14,7 +14,7 @@ // http://muflihun.com // -#include "easylogging++.h" +#include #if defined(AUTO_INITIALIZE_EASYLOGGINGPP) INITIALIZE_EASYLOGGINGPP