fix building under linux

This commit is contained in:
Robin Appelman
2018-11-09 00:07:32 +01:00
parent 0c6a7ff498
commit 20853df594
4 changed files with 8 additions and 3 deletions
+4 -3
View File
@@ -59,8 +59,9 @@ win32 {
INCLUDEPATH += third-party/openvr/headers \ INCLUDEPATH += third-party/openvr/headers \
third-party/easylogging++ third-party/easylogging++
win32:LIBS += -L"$$PWD/third-party/openvr/lib/win64" win32:LIBS += -L"$$PWD/third-party/openvr/lib/win64" -luser32 -lole32
unix:LIBS += -L"$$PWD/third-party/openvr/lib/linux64" unix:LIBS += -L"$$PWD/third-party/openvr/lib/linux64"
LIBS += -lopenvr_api -luser32 -lole32 LIBS += -lopenvr_api
DESTDIR = bin/win64/AdvancedSettings win32:DESTDIR = bin/win64/AdvancedSettings
unix:DESTDIR = bin/linux/AdvancedSettings
+2
View File
@@ -28,6 +28,8 @@ namespace advsettings {
std::unique_ptr<OverlayController> OverlayController::singleton; std::unique_ptr<OverlayController> OverlayController::singleton;
constexpr const char* OverlayController::applicationVersionString;
QSettings* OverlayController::_appSettings = nullptr; QSettings* OverlayController::_appSettings = nullptr;
OverlayController::~OverlayController() { OverlayController::~OverlayController() {
@@ -1,6 +1,7 @@
#include "ChaperoneTabController.h" #include "ChaperoneTabController.h"
#include <QQuickWindow> #include <QQuickWindow>
#include "../overlaycontroller.h" #include "../overlaycontroller.h"
#include <math.h>
// application namespace // application namespace
namespace advsettings { namespace advsettings {
+1
View File
@@ -1,6 +1,7 @@
#include "ChaperoneUtils.h" #include "ChaperoneUtils.h"
#include <iostream> #include <iostream>
#include <math.h>
namespace utils { namespace utils {