Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

Merge branch 'pinmap'

Browse Source 
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>

Conflicts:
	api/maa.h
	src/CMakeLists.txt
This commit is contained in:
Thomas Ingleby
2014-05-01 17:37:56 +01:00
parent 7023a3213a ea81a0ba75
commit be92ed306d
14 changed files with 283 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -12,6 +12,7 @@ set (maa_LIB_HEADERS
${PROJECT_SOURCE_DIR}/api/aio.h
${PROJECT_SOURCE_DIR}/include/smbus.h
${PROJECT_SOURCE_DIR}/include/version.h
${PROJECT_SOURCE_DIR}/include/intel_galileo_rev_d.h
)
set (maa_LIB_KERNEL
@@ -29,6 +30,7 @@ set (maa_LIB_SRCS
${PROJECT_SOURCE_DIR}/src/pwm/pwm.c
${PROJECT_SOURCE_DIR}/src/spi/spi.c
${PROJECT_SOURCE_DIR}/src/aio/aio.c
${PROJECT_SOURCE_DIR}/src/intel_galileo_rev_d.c
# autogenerated version file
${CMAKE_CURRENT_BINARY_DIR}/version.c
)