From 7bb89c72d995e0d258fb0bf944748af525045b97 Mon Sep 17 00:00:00 2001 From: morg Date: Thu, 19 Jan 2023 11:22:38 +0100 Subject: [PATCH] Update OpenRGB API version --- OpenRGB | 2 +- OpenRGBE131ReceiverDialog.cpp | 6 +++--- OpenRGBE131ReceiverPlugin.pro | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/OpenRGB b/OpenRGB index fb88964..7bf0e40 160000 --- a/OpenRGB +++ b/OpenRGB @@ -1 +1 @@ -Subproject commit fb88964b8e514cdf4eb22da314e13f8db06a3636 +Subproject commit 7bf0e40fd87ac6f8b54424e22e32108dedc0f378 diff --git a/OpenRGBE131ReceiverDialog.cpp b/OpenRGBE131ReceiverDialog.cpp index ee1e7af..c3d0b37 100644 --- a/OpenRGBE131ReceiverDialog.cpp +++ b/OpenRGBE131ReceiverDialog.cpp @@ -5,8 +5,8 @@ #include #include #include - #include +#include "filesystem.h" #ifndef _WIN32 #include @@ -819,7 +819,7 @@ void OpenRGBE131ReceiverDialog::on_ButtonSaveMap_clicked() /*-----------------------------------------------------*\ | Write out the JSON structure to a file | \*-----------------------------------------------------*/ - std::ofstream universe_file(resource_manager->GetConfigurationDirectory() + "/plugins/E131UniverseMap.json", std::ios::out | std::ios::binary); + std::ofstream universe_file(resource_manager->GetConfigurationDirectory() / "plugins" / "settings" / "E131UniverseMap.json", std::ios::out | std::ios::binary); if(universe_file) { @@ -846,7 +846,7 @@ void OpenRGBE131ReceiverDialog::on_ButtonLoadMap_clicked() /*---------------------------------------------------------*\ | Open input file in binary mode | \*---------------------------------------------------------*/ - std::ifstream universe_file(resource_manager->GetConfigurationDirectory() + "/plugins/E131UniverseMap.json", std::ios::in | std::ios::binary); + std::ifstream universe_file(resource_manager->GetConfigurationDirectory() / "plugins" / "settings" / "E131UniverseMap.json", std::ios::in | std::ios::binary); /*---------------------------------------------------------*\ | Read settings into JSON store | diff --git a/OpenRGBE131ReceiverPlugin.pro b/OpenRGBE131ReceiverPlugin.pro index 3ee0312..c63fb9d 100644 --- a/OpenRGBE131ReceiverPlugin.pro +++ b/OpenRGBE131ReceiverPlugin.pro @@ -14,6 +14,11 @@ QT += greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +win32:CONFIG += c++17 + +unix:!macx { + QMAKE_CXXFLAGS += -std=c++17 +} #-----------------------------------------------------------------------------------------------# # Automatically generated build information # @@ -31,8 +36,6 @@ DEFINES += TEMPLATE = lib DEFINES += ORGBEXAMPLEPLUGIN_LIBRARY -CONFIG += c++11 - #-----------------------------------------------------------------------------------------------# # Plugin Project Files # #-----------------------------------------------------------------------------------------------#