mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
merge remote-tracking branch 'origin/macos_compile' into macos_compile
Former-commit-id: 9e76cece0e44a7b8112b6053ae5da44059bde61f
This commit is contained in:
commit
e84f9eb147
1
dependencies/build/hidapi/CMakeLists.txt
vendored
1
dependencies/build/hidapi/CMakeLists.txt
vendored
@ -3,6 +3,7 @@ project(hidapi)
|
|||||||
# Add the 'generic' hidapi include directory
|
# Add the 'generic' hidapi include directory
|
||||||
include_directories(../../include/hidapi)
|
include_directories(../../include/hidapi)
|
||||||
|
|
||||||
|
#TODO[TvdZ]: Rename hidapi-??? to hidapi
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
|
|
||||||
find_package(IOKit REQUIRED)
|
find_package(IOKit REQUIRED)
|
||||||
|
@ -12,51 +12,51 @@ include_directories(
|
|||||||
${LIBUSB_1_INCLUDE_DIRS}) # for Lightpack device
|
${LIBUSB_1_INCLUDE_DIRS}) # for Lightpack device
|
||||||
|
|
||||||
# Group the headers that go through the MOC compiler
|
# Group the headers that go through the MOC compiler
|
||||||
|
SET(Leddevice_QT_HEADERS
|
||||||
|
${CURRENT_SOURCE_DIR}/LedDeviceAdalight.h
|
||||||
|
)
|
||||||
|
|
||||||
SET(Leddevice_HEADERS
|
SET(Leddevice_HEADERS
|
||||||
${CURRENT_HEADER_DIR}/LedDevice.h
|
${CURRENT_HEADER_DIR}/LedDevice.h
|
||||||
${CURRENT_HEADER_DIR}/LedDeviceFactory.h
|
${CURRENT_HEADER_DIR}/LedDeviceFactory.h
|
||||||
|
|
||||||
${CURRENT_SOURCE_DIR}/LedRs232Device.h
|
${CURRENT_SOURCE_DIR}/LedRs232Device.h
|
||||||
|
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceTest.h
|
${CURRENT_SOURCE_DIR}/LedDeviceTest.h
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceSedu.h
|
${CURRENT_SOURCE_DIR}/LedDeviceSedu.h
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceLightpack.h
|
${CURRENT_SOURCE_DIR}/LedDeviceLightpack.h
|
||||||
${CURRENT_SOURCE_DIR}/LedDevicePaintpack.h
|
${CURRENT_SOURCE_DIR}/LedDevicePaintpack.h
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceMultiLightpack.h
|
${CURRENT_SOURCE_DIR}/LedDeviceMultiLightpack.h
|
||||||
|
${CURRENT_SOURCE_DIR}/LedDeviceWs2811.h
|
||||||
)
|
)
|
||||||
|
|
||||||
SET(Leddevice_SOURCES
|
SET(Leddevice_SOURCES
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceFactory.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceFactory.cpp
|
||||||
|
|
||||||
|
${CURRENT_SOURCE_DIR}/LedDeviceAdalight.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedRs232Device.cpp
|
${CURRENT_SOURCE_DIR}/LedRs232Device.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceSedu.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceSedu.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceTest.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceTest.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceLightpack.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceLightpack.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDevicePaintpack.cpp
|
${CURRENT_SOURCE_DIR}/LedDevicePaintpack.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceMultiLightpack.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceMultiLightpack.cpp
|
||||||
|
${CURRENT_SOURCE_DIR}/LedDeviceWs2811.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_SPIDEV)
|
if(ENABLE_SPIDEV)
|
||||||
SET(Leddevice_QT_HEADERS
|
|
||||||
${Leddevice_QT_HEADERS}
|
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceAdalight.h
|
|
||||||
)
|
|
||||||
SET(Leddevice_HEADERS
|
SET(Leddevice_HEADERS
|
||||||
${Leddevice_HEADERS}
|
${Leddevice_HEADERS}
|
||||||
${CURRENT_SOURCE_DIR}/LedSpiDevice.h
|
${CURRENT_SOURCE_DIR}/LedSpiDevice.h
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceLpd6803.h
|
${CURRENT_SOURCE_DIR}/LedDeviceLpd6803.h
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceLpd8806.h
|
${CURRENT_SOURCE_DIR}/LedDeviceLpd8806.h
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceWs2801.h
|
${CURRENT_SOURCE_DIR}/LedDeviceWs2801.h
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceWs2811.h
|
|
||||||
)
|
)
|
||||||
SET(Leddevice_SOURCES
|
SET(Leddevice_SOURCES
|
||||||
${Leddevice_SOURCES}
|
${Leddevice_SOURCES}
|
||||||
${CURRENT_SOURCE_DIR}/LedSpiDevice.cpp
|
${CURRENT_SOURCE_DIR}/LedSpiDevice.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceAdalight.cpp
|
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceLpd6803.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceLpd6803.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceLpd8806.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceLpd8806.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceWs2801.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceWs2801.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceWs2811.cpp
|
|
||||||
)
|
)
|
||||||
endif(ENABLE_SPIDEV)
|
endif(ENABLE_SPIDEV)
|
||||||
|
|
||||||
|
@ -74,6 +74,7 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig)
|
|||||||
|
|
||||||
device = deviceLpd8806;
|
device = deviceLpd8806;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
else if (type == "adalight")
|
else if (type == "adalight")
|
||||||
{
|
{
|
||||||
const std::string output = deviceConfig["output"].asString();
|
const std::string output = deviceConfig["output"].asString();
|
||||||
@ -84,7 +85,6 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig)
|
|||||||
|
|
||||||
device = deviceAdalight;
|
device = deviceAdalight;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
else if (type == "sedu")
|
else if (type == "sedu")
|
||||||
{
|
{
|
||||||
const std::string output = deviceConfig["output"].asString();
|
const std::string output = deviceConfig["output"].asString();
|
||||||
|
Loading…
Reference in New Issue
Block a user