diff --git a/Software/grab/grab.pro b/Software/grab/grab.pro index 549580095..de4c5f343 100644 --- a/Software/grab/grab.pro +++ b/Software/grab/grab.pro @@ -23,6 +23,10 @@ INCLUDEPATH += ./include \ ../math/include \ .. +QMAKE_CFLAGS = $$(CFLAGS) +QMAKE_CXXFLAGS = $$(CXXFLAGS) +QMAKE_LFLAGS = $$(LDFLAGS) + QMAKE_CXXFLAGS += -std=c++17 CONFIG(clang) { QMAKE_CXXFLAGS += -stdlib=libc++ diff --git a/Software/src/LedDeviceManager.cpp b/Software/src/LedDeviceManager.cpp index d582e29f4..25d7a0431 100644 --- a/Software/src/LedDeviceManager.cpp +++ b/Software/src/LedDeviceManager.cpp @@ -452,44 +452,50 @@ AbstractLedDevice * LedDeviceManager::createLedDevice(SupportedDevices::DeviceTy AbstractLedDevice* device = nullptr; - switch (deviceType){ + switch (deviceType) { case SupportedDevices::DeviceTypeLightpack: DEBUG_LOW_LEVEL << Q_FUNC_INFO << "SupportedDevices::LightpackDevice"; device = (AbstractLedDevice *)new LedDeviceLightpack(); + break; case SupportedDevices::DeviceTypeAlienFx: DEBUG_LOW_LEVEL << Q_FUNC_INFO << "SupportedDevices::AlienFxDevice"; # ifdef Q_OS_WIN device = (AbstractLedDevice *)new LedDeviceAlienFx(); -# else - break; # endif /* Q_OS_WIN */ + break; case SupportedDevices::DeviceTypeAdalight: DEBUG_LOW_LEVEL << Q_FUNC_INFO << "SupportedDevices::AdalightDevice"; device = (AbstractLedDevice *)new LedDeviceAdalight(Settings::getAdalightSerialPortName(), Settings::getAdalightSerialPortBaudRate()); + break; case SupportedDevices::DeviceTypeArdulight: DEBUG_LOW_LEVEL << Q_FUNC_INFO << "SupportedDevices::ArdulightDevice"; device = (AbstractLedDevice *)new LedDeviceArdulight(Settings::getArdulightSerialPortName(), Settings::getArdulightSerialPortBaudRate()); + break; case SupportedDevices::DeviceTypeDrgb: DEBUG_LOW_LEVEL << Q_FUNC_INFO << "SupportedDevices::DrgbDevice"; device = (AbstractLedDevice*)new LedDeviceDrgb(Settings::getDrgbAddress(), Settings::getDrgbPort(), Settings::getDrgbTimeout()); + break; case SupportedDevices::DeviceTypeDnrgb: DEBUG_LOW_LEVEL << Q_FUNC_INFO << "SupportedDevices::DnrgbDevice"; device = (AbstractLedDevice*)new LedDeviceDnrgb(Settings::getDnrgbAddress(), Settings::getDnrgbPort(), Settings::getDnrgbTimeout()); + break; case SupportedDevices::DeviceTypeWarls: DEBUG_LOW_LEVEL << Q_FUNC_INFO << "SupportedDevices::WarlsDevice"; device = (AbstractLedDevice*)new LedDeviceWarls(Settings::getWarlsAddress(), Settings::getWarlsPort(), Settings::getWarlsTimeout()); + break; case SupportedDevices::DeviceTypeVirtual: DEBUG_LOW_LEVEL << Q_FUNC_INFO << "SupportedDevices::VirtualDevice"; device = (AbstractLedDevice *)new LedDeviceVirtual(); + break; default: break; diff --git a/Software/src/src.pro b/Software/src/src.pro index 7d1dada82..1f3c184c4 100644 --- a/Software/src/src.pro +++ b/Software/src/src.pro @@ -58,6 +58,10 @@ DEFINES += $${SUPPORTED_GRABBERS} LIBS += -L../lib -lgrab -lprismatik-math +QMAKE_CFLAGS = $$(CFLAGS) +QMAKE_CXXFLAGS = $$(CXXFLAGS) +QMAKE_LFLAGS = $$(LDFLAGS) + CONFIG(gcc):QMAKE_CXXFLAGS += -std=c++11 CONFIG(clang) { QMAKE_CXXFLAGS += -std=c++11 -stdlib=libc++