Merge pull request #13 from OpenVR-Advanced-Settings/update-dep-log

Update easylogging++ from 9.84 to 9.96.7, turn on warnings as errors for clang-msvc

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")
 
@@ -18,11 +20,10 @@ TEMPLATE = app
     #D9025: overriding '/W4' with '/W3'
     QMAKE_CFLAGS_WARN_ON -= -W3
     QMAKE_CXXFLAGS_WARN_ON -= -W3
+    #C4127 was in a third party file with no way to turn off.
     QMAKE_CXXFLAGS += /W4 /wd4127
+    QMAKE_CXXFLAGS += /WX
 
-    !*clang-msvc{ 
-        QMAKE_CXXFLAGS += /WX
-    }
 }
 
 *g++* {
@@ -54,7 +55,6 @@ SOURCES += src/main.cpp\
     src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp
 
 HEADERS += src/overlaycontroller.h \
-    src/logging.h \
     src/tabcontrollers/AudioTabController.h \
     src/tabcontrollers/ChaperoneTabController.h \
     src/tabcontrollers/FixFloorTabController.h \
@@ -83,7 +83,8 @@ win32 {
 
 INCLUDEPATH += third-party/openvr/headers \
                         third-party/easylogging++
-
+#easylogging++ used to be a header only lib. Now requires easylogging++.cc
+SOURCES += third-party/easylogging++/easylogging++.cc
 win32:LIBS += -L"$$PWD/third-party/openvr/lib/win64" -luser32 -lole32
 unix:LIBS += -L"$$PWD/third-party/openvr/lib/linux64"
 LIBS += -lopenvr_api

src/logging.h

@@ -1,16 +0,0 @@
-#pragma once
-
-// easylogging includes
-#ifndef _DEBUG
-#    define _DEBUG
-#    define ELPP_THREAD_SAFE
-#    define ELPP_QT_LOGGING
-#    define ELPP_NO_DEFAULT_LOG_FILE
-#    include <easylogging++.h>
-#    undef _DEBUG
-#else
-#    define ELPP_THREAD_SAFE
-#    define ELPP_QT_LOGGING
-#    define ELPP_NO_DEFAULT_LOG_FILE
-#    include <easylogging++.h>
-#endif

src/main.cpp

@@ -8,7 +8,7 @@
 #include <QStandardPaths>
 #include <openvr.h>
 #include <iostream>
-#include "logging.h"
+#include <easylogging++.h>
 
 INITIALIZE_EASYLOGGINGPP
 

src/overlaycontroller.cpp

@@ -18,7 +18,7 @@
 #include <iostream>
 #include <cmath>
 #include <openvr.h>
-#include "logging.h"
+#include <easylogging++.h>
 #include "utils/Matrix.h"
 
 // application namespace

src/overlaycontroller.h

@@ -22,7 +22,7 @@
 #include <QQuickRenderControl>
 #include <QSoundEffect>
 #include <memory>
-#include "logging.h"
+#include <easylogging++.h>
 #include "utils/ChaperoneUtils.h"
 
 #include "tabcontrollers/SteamVRTabController.h"

src/tabcontrollers/audiomanager/AudioManagerWindows.cpp

@@ -1,6 +1,6 @@
 #include "audiomanagerwindows.h"
 #include <exception>
-#include "../../logging.h"
+#include "easylogging++.h"
 #include "../AudioTabController.h"
 
 #include <locale>

src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp

@@ -1,6 +1,6 @@
 #include "KeyboardInputWindows.h"
 #include <Windows.h>
-#include "../../logging.h"
+#include "easylogging++.h"
 
 namespace advsettings
 {

third-party/easylogging++/LICENSE

@@ -1,10 +1,11 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 muflihun.com
+Copyright (c) 2012-2018 Zuhd Web Services
+Copyright (c) 2012-2018 @abumusamq
 
-http://github.com/easylogging/
+https://github.com/zuhd-org/
-http://easylogging.muflihun.com
+https://zuhd.org
-http://muflihun.com
+https://muflihun.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in