frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'paintpack' into add_effect_engine

Browse Source 
Conflicts:
	libsrc/hyperion/CMakeLists.txt

Former-commit-id: c8264fed9cdf560da1621700e105b24977c58b7b
This commit is contained in:
T. van der Zwan
2013-12-12 22:06:18 +00:00
parent 155c2a0ae9 599afe675f
commit a74801a113
4 changed files with 147 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libsrc/hyperion/CMakeLists.txt
View File

@@ -40,6 +40,7 @@ SET(Hyperion_HEADERS
${CURRENT_SOURCE_DIR}/device/LedDeviceLpd6803.h
${CURRENT_SOURCE_DIR}/device/LedDeviceLpd8806.h
${CURRENT_SOURCE_DIR}/device/LedDeviceLightpack.h
${CURRENT_SOURCE_DIR}/device/LedDevicePaintpack.h
${CURRENT_SOURCE_DIR}/device/LedDeviceMultiLightpack.h
)
@@ -65,6 +66,7 @@ SET(Hyperion_SOURCES
${CURRENT_SOURCE_DIR}/device/LedDeviceLpd8806.cpp
${CURRENT_SOURCE_DIR}/device/LedDeviceAdalight.cpp
${CURRENT_SOURCE_DIR}/device/LedDeviceLightpack.cpp
${CURRENT_SOURCE_DIR}/device/LedDevicePaintpack.cpp
${CURRENT_SOURCE_DIR}/device/LedDeviceMultiLightpack.cpp
)
@@ -87,6 +89,7 @@ add_library(hyperion
target_link_libraries(hyperion
hyperion-utils
effectengine
hidapi-libusb
serialport
${LIBUSB_1_LIBRARIES} #apt-get install libusb-1.0-0-dev
${CMAKE_THREAD_LIBS_INIT}