Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

yc/add matrix demo - Adding a server example for MATRIX Creator/Voice boards #69

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

yc/add matrix demo - Adding a server example for MATRIX Creator/Voice boards #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2c34d1
Add matrix demo for odas
yoelrc88 Jun 5, 2018
969ab6d
Add config files ready for matrix demo
yoelrc88 Jun 5, 2018
144be96
Add simple guide for matrix demo
yoelrc88 Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(PC_FFTW3 REQUIRED fftw3f)
pkg_check_modules(PC_ALSA REQUIRED alsa)
pkg_check_modules(PC_LIBCONFIG REQUIRED libconfig)
pkg_search_module (PC_JSON-C REQUIRED json-c json)
find_library(MATRIX_CREATOR_HAL matrix_creator_hal)

include_directories("${PROJECT_SOURCE_DIR}/include")

Expand All @@ -22,6 +24,10 @@ include_directories(include/odas)

add_subdirectory(include)

find_path (JSON_C_INCLUDE_DIR json.h PATH_SUFFIXES json-c json)
find_library (JSON_C_LIBRARIES NAMES json-c libjson-c)
include_directories (${JSON_C_INCLUDE_DIR})

set(SRC

src/general/format.c
Expand Down Expand Up @@ -209,6 +215,15 @@ target_link_libraries(odaslive
odas
)

add_executable(matrix-odas
demo/matrix-demos/matrix-odas.cpp
)
target_link_libraries(matrix-odas
odas
${JSON_C_LIBRARIES}
${MATRIX_CREATOR_HAL}
)

add_executable(odasserver
demo/odasserver/main.c
)
Expand Down
Loading