jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated OpenRGB.pro to dynamically resolve source files

Browse source 
* Created FORMS macro list dynamically
* Added GUI_H and CONTROLLERS_H list to HEADERS
* Added GUI_CPP and CONTROLLERS_CPP list to SOURCES
* Added unique list of GUI_INCLUDES and CONTROLLER_INCLUDES to INCLUDES
* Adjusted platform specific builds to align build targets
This commit is contained in:
Chris M 2023-11-08 23:02:31 +11:00 • committed by Chris
parent f4220dffb7
commit d2b4ff1c56
37 changed files with 98 additions and 1557 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Controllers/AsusTUFLaptopController/AsusTUFLaptopLinuxController.cpp → Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Linux.cpp
View file

@ -1,4 +1,4 @@
#include "AsusTUFLaptopLinuxController.h"
#include "AsusTUFLaptopController_Linux.h"
#include <string>

0
Controllers/AsusTUFLaptopController/AsusTUFLaptopLinuxController.h → Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Linux.h
View file

2
Controllers/AsusTUFLaptopController/AsusTUFLaptopController.cpp → Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.cpp
View file

@ -1,6 +1,6 @@
#ifdef _WIN32
#include "AsusTUFLaptopController.h"
#include "AsusTUFLaptopController_Windows.h"
#include <Objbase.h>
#include <setupapi.h>

0
Controllers/AsusTUFLaptopController/AsusTUFLaptopController.h → Controllers/AsusTUFLaptopController/AsusTUFLaptopController_Windows.h
View file

3
Controllers/AsusTUFLaptopController/AsusTUFLaptopLinuxDetect.cpp → Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Linux.cpp
View file

@ -1,5 +1,4 @@
#include "RGBController_AsusTUFLaptopLinux.h"
#include "AsusTUFLaptopLinuxController.h"
#include "RGBController_AsusTUFLaptop_Linux.h"
#include <string>
#include "Detector.h"

3
Controllers/AsusTUFLaptopController/AsusTUFLaptopWMIDetect.cpp → Controllers/AsusTUFLaptopController/AsusTUFLaptopDetect_Windows.cpp
View file

@ -1,7 +1,6 @@
#ifdef _WIN32
#include "AsusTUFLaptopController.h"
#include "RGBController_AsusTUFLaptopWMI.h"
#include "RGBController_AsusTUFLaptop_Windows.h"
#include "Detector.h"
#include "wmi.h"

2
Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopLinux.cpp → Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.cpp
View file

@ -1,4 +1,4 @@
#include "RGBController_AsusTUFLaptopLinux.h"
#include "RGBController_AsusTUFLaptop_Linux.h"
/**------------------------------------------------------------------*\
@name Asus TUF Laptop Linux WMI

2
Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopLinux.h → Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Linux.h
View file

@ -2,7 +2,7 @@
#define RGBCONTROLLER_ASUSTUFLAPTOPLINUX_H
#include "RGBController.h"
#include "AsusTUFLaptopLinuxController.h"
#include "AsusTUFLaptopController_Linux.h"
class RGBController_AsusTUFLaptopLinux : public RGBController

2
Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp → Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Windows.cpp
View file

@ -1,6 +1,6 @@
#ifdef _WIN32
#include "RGBController_AsusTUFLaptopWMI.h"
#include "RGBController_AsusTUFLaptop_Windows.h"
using namespace std::chrono_literals;

2
Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.h → Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptop_Windows.h
View file

@ -3,7 +3,7 @@
#ifndef RGBCONTROLLER_ASUSTUFLAPTOPWMI_H
#define RGBCONTROLLER_ASUSTUFLAPTOPWMI_H
#include "AsusTUFLaptopController.h"
#include "AsusTUFLaptopController_Windows.h"
#include "RGBController.h"
class RGBController_AsusTUFLaptopWMI : public RGBController

1
Controllers/ENESMBusController/ENESMBusControllerDetect.cpp
View file

@ -1,7 +1,6 @@
#include "Detector.h"
#include "ENESMBusController.h"
#include "ENESMBusInterface_i2c_smbus.h"
#include "ENESMBusInterface_SpectrixS40G.h"
#include "LogManager.h"
#include "RGBController.h"
#include "RGBController_ENESMBus.h"

2
Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.cpp → Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G_Linux.cpp
View file

@ -7,7 +7,7 @@
| Adam Honse (CalcProgrammer1) 11/21/2021 |
\*-----------------------------------------*/
#include "ENESMBusInterface_SpectrixS40G.h"
#include "ENESMBusInterface_SpectrixS40G_Linux.h"
#include <sys/ioctl.h>
#include <cstring>
#include <cstdint>

0
Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.h → Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G_Linux.h
View file

2
Controllers/ENESMBusController/XPGSpectrixS40GDetect.cpp → Controllers/ENESMBusController/XPGSpectrixS40GDetect_Linux.cpp
View file

@ -1,6 +1,6 @@
#include "Detector.h"
#include "ENESMBusController.h"
#include "ENESMBusInterface_SpectrixS40G.h"
#include "ENESMBusInterface_SpectrixS40G_Linux.h"
#include "LogManager.h"
#include "RGBController.h"
#include "RGBController_ENESMBus.h"

2
Controllers/FaustusController/RGBController_Faustus.cpp → Controllers/FaustusController/RGBController_Faustus_Linux.cpp
View file

@ -1,4 +1,4 @@
#include "RGBController_Faustus.h"
#include "RGBController_Faustus_Linux.h"
#include "Detector.h"
#include <dirent.h>
#include <string.h>

0
Controllers/FaustusController/RGBController_Faustus.h → Controllers/FaustusController/RGBController_Faustus_Linux.h
View file

1
Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematControllerDetect.cpp → Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematControllerDetect_Linux.cpp
View file

@ -1,5 +1,4 @@
#include "Detector.h"
#include "HYTEMousematController.h"
#include "RGBController.h"
#include "RGBController_HYTEMousemat.h"
#include <vector>

2
Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController.cpp → Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController_Linux.cpp
View file

@ -6,7 +6,7 @@
| Adam Honse (calcprogrammer1@gmail.com), 7/18/2023 |
\*---------------------------------------------------------*/
#include "HYTEMousematController.h"
#include "HYTEMousematController_Linux.h"
#include <cstring>
#include <iomanip>

0
Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController.h → Controllers/HYTEMousematController/HYTEMousematController_libusb/HYTEMousematController_Linux.h
View file

2
Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematControllerDetect.cpp → Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematControllerDetect_Windows.cpp
View file

@ -1,5 +1,5 @@
#include "Detector.h"
#include "HYTEMousematController.h"
#include "HYTEMousematController_Windows.h"
#include "RGBController.h"
#include "RGBController_HYTEMousemat.h"
#include "find_usb_serial_port.h"

2
Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController.cpp → Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController_Windows.cpp
View file

@ -6,7 +6,7 @@
| Adam Honse (calcprogrammer1@gmail.com), 7/18/2023 |
\*---------------------------------------------------------*/
#include "HYTEMousematController.h"
#include "HYTEMousematController_Windows.h"
HYTEMousematController::HYTEMousematController(char* port)
{

0
Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController.h → Controllers/HYTEMousematController/HYTEMousematController_serial/HYTEMousematController_Windows.h
View file

6
Controllers/HYTEMousematController/RGBController_HYTEMousemat.h
View file

@ -10,7 +10,11 @@
#pragma once
#include "RGBController.h"
#include "HYTEMousematController.h"
#ifdef _WIN32
#include "HYTEMousematController_Windows.h"
#else
#include "HYTEMousematController_Linux.h"
#endif
enum
{

3
Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp → Controllers/LinuxLEDController/LinuxLEDControllerDetect_Linux.cpp
View file

@ -1,7 +1,6 @@
#include "Detector.h"
#include "LinuxLEDController.h"
#include "RGBController.h"
#include "RGBController_LinuxLED.h"
#include "RGBController_LinuxLED_Linux.h"
#include "SettingsManager.h"
#include <vector>
#include <stdio.h>

2
Controllers/LinuxLEDController/LinuxLEDController.cpp → Controllers/LinuxLEDController/LinuxLEDController_Linux.cpp
View file

@ -1,4 +1,4 @@
#include "LinuxLEDController.h"
#include "LinuxLEDController_Linux.h"
LinuxLEDController::LinuxLEDController()
{

0
Controllers/LinuxLEDController/LinuxLEDController.h → Controllers/LinuxLEDController/LinuxLEDController_Linux.h
View file

2
Controllers/LinuxLEDController/RGBController_LinuxLED.cpp → Controllers/LinuxLEDController/RGBController_LinuxLED_Linux.cpp
View file

@ -6,7 +6,7 @@
| Adam Honse (CalcProgrammer1) 9/25/2020 |
\*-----------------------------------------*/
#include "RGBController_LinuxLED.h"
#include "RGBController_LinuxLED_Linux.h"
/**------------------------------------------------------------------*\
@name Dummy

2
Controllers/LinuxLEDController/RGBController_LinuxLED.h → Controllers/LinuxLEDController/RGBController_LinuxLED_Linux.h
View file

@ -8,7 +8,7 @@
#pragma once
#include "RGBController.h"
#include "LinuxLEDController.h"
#include "LinuxLEDController_Linux.h"
class RGBController_LinuxLED : public RGBController
{

2
Controllers/NVIDIAIlluminationController/NVIDIAIlluminationControllerDetect.cpp → Controllers/NVIDIAIlluminationController/NVIDIAIlluminationControllerDetect_Windows.cpp
View file

@ -11,7 +11,7 @@
#include "LogManager.h"
#include "RGBController.h"
#include "RGBController_NVIDIAIllumination.h"
#include "RGBController_NVIDIAIllumination_Windows.h"
#include "pci_ids.h"
#include <vector>

2
Controllers/NVIDIAIlluminationController/NVIDIAIlluminationV1Controller.cpp → Controllers/NVIDIAIlluminationController/NVIDIAIlluminationV1Controller_Windows.cpp
View file

@ -6,7 +6,7 @@
| Carter Miller (GingerRunner) 1/5/2022 |
\*-----------------------------------------------*/
#include "NVIDIAIlluminationV1Controller.h"
#include "NVIDIAIlluminationV1Controller_Windows.h"
NVIDIAIlluminationV1Controller::NVIDIAIlluminationV1Controller(nvapi_accessor* nvapi_ptr, bool treats_rgbw_as_rgb)
{

2
Controllers/NVIDIAIlluminationController/NVIDIAIlluminationV1Controller.h → Controllers/NVIDIAIlluminationController/NVIDIAIlluminationV1Controller_Windows.h
View file

@ -12,7 +12,7 @@
#include <string>
#include <vector>
#include <cstring>
#include "nvapi_accessor.h"
#include "nvapi_accessor_Windows.h"
#include "RGBController.h"
#include "LogManager.h"

3
Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.cpp → Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination_Windows.cpp
View file

@ -45,8 +45,7 @@
\*-------------------------------------------------------------------*/
#include "RGBController_NVIDIAIllumination.h"
#include "NVIDIAIlluminationV1Controller.h"
#include "RGBController_NVIDIAIllumination_Windows.h"
#include <array>
RGBController_NVIDIAIlluminationV1::RGBController_NVIDIAIlluminationV1(NVIDIAIlluminationV1Controller* controller_ptr)

4
Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.h → Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination_Windows.h
View file

@ -11,7 +11,7 @@
#pragma once
#include "RGBController.h"
#include "NVIDIAIlluminationV1Controller.h"
#include "NVIDIAIlluminationV1Controller_Windows.h"
#include <map>
#define NVIDIA_FOUNDERS_V1_CONTROLLER_NAME "NVIDIA_FOUNDERS_V1"
@ -37,4 +37,4 @@ class RGBController_NVIDIAIlluminationV1 : public RGBController
std::vector<uint8_t> zoneIndexMap;
std::vector<NV_GPU_CLIENT_ILLUM_ZONE_TYPE> zoneTypes;
std::map<NV_GPU_CLIENT_ILLUM_ZONE_TYPE, const char *> nvidia_illum_zone_names;
};
};

2
Controllers/NVIDIAIlluminationController/nvapi_accessor.cpp → Controllers/NVIDIAIlluminationController/nvapi_accessor_Windows.cpp
View file

@ -7,7 +7,7 @@
| Carter Miller (GingerRunner) 6/20/2022 |
\*-----------------------------------------*/
#include "nvapi_accessor.h"
#include "nvapi_accessor_Windows.h"
#include <thread>
#include <chrono>

0
Controllers/NVIDIAIlluminationController/nvapi_accessor.h → Controllers/NVIDIAIlluminationController/nvapi_accessor_Windows.h
View file

1585
OpenRGB.pro
View file

File diff suppressed because it is too large Load diff

8
scripts/AppImage.patch
View file

@ -1,14 +1,14 @@
--- a/OpenRGB.pro 2022-05-02 15:26:15.375947000 +0200
+++ b/OpenRGB.pro 2022-05-02 15:29:01.997135000 +0200
@@ -1310,8 +1310,6 @@
@@ -447,8 +447,6 @@
# Linux-specific Configuration #
#-----------------------------------------------------------------------------------------------#
contains(QMAKE_PLATFORM, linux) {
- TARGET = $$lower($$TARGET)
-
INCLUDEPATH += \
Controllers/FaustusController \
Controllers/LinuxLEDController \
HEADERS -= $$CONTROLLER_H_WIN
HEADERS += \
--- a/qt/OpenRGB.desktop 2022-05-02 15:25:52.150332000 +0200
+++ b/qt/OpenRGB.desktop 2022-05-02 15:28:27.749598000 +0200
@@ -3,7 +3,7 @@