Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git into multi_colortransform

Former-commit-id: fb4ab6331b5428bd34f5cc7ac7eba3fade5ef7dc
This commit is contained in:
T. van der Zwan
2013-11-20 08:26:09 +00:00
14 changed files with 51 additions and 14 deletions

View File

@@ -27,7 +27,9 @@ add_executable(test_image2ledsmap
target_link_libraries(test_image2ledsmap
hyperion)
add_subdirectory(dispmanx2png)
if (ENABLE_DISPMANX)
add_subdirectory(dispmanx2png)
endif (ENABLE_DISPMANX)
add_executable(test_blackborderdetector
TestBlackBorderDetector.cpp)