From 20853df59493eacd5bca4157bb6aee0c5b4cbf05 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 8 Nov 2018 17:05:15 +0100 Subject: [PATCH] fix building under linux --- advancedSettings.pro | 7 ++++--- src/overlaycontroller.cpp | 2 ++ src/tabcontrollers/ChaperoneTabController.cpp | 1 + src/utils/ChaperoneUtils.cpp | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/advancedSettings.pro b/advancedSettings.pro index be0e6fa..faf9b2d 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -59,8 +59,9 @@ win32 { INCLUDEPATH += third-party/openvr/headers \ 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" -LIBS += -lopenvr_api -luser32 -lole32 +LIBS += -lopenvr_api -DESTDIR = bin/win64/AdvancedSettings +win32:DESTDIR = bin/win64/AdvancedSettings +unix:DESTDIR = bin/linux/AdvancedSettings diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp index 134434b..bba2a2d 100644 --- a/src/overlaycontroller.cpp +++ b/src/overlaycontroller.cpp @@ -28,6 +28,8 @@ namespace advsettings { std::unique_ptr OverlayController::singleton; +constexpr const char* OverlayController::applicationVersionString; + QSettings* OverlayController::_appSettings = nullptr; OverlayController::~OverlayController() { diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp index 9895d86..cbde2e2 100644 --- a/src/tabcontrollers/ChaperoneTabController.cpp +++ b/src/tabcontrollers/ChaperoneTabController.cpp @@ -1,6 +1,7 @@ #include "ChaperoneTabController.h" #include #include "../overlaycontroller.h" +#include // application namespace namespace advsettings { diff --git a/src/utils/ChaperoneUtils.cpp b/src/utils/ChaperoneUtils.cpp index 21476dd..a0cbf6c 100644 --- a/src/utils/ChaperoneUtils.cpp +++ b/src/utils/ChaperoneUtils.cpp @@ -1,6 +1,7 @@ #include "ChaperoneUtils.h" #include +#include namespace utils {