From 322f8932476eda944c7d3ac65eafde12c69b2ae9 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Tue, 5 Jun 2018 10:29:47 +0200 Subject: Rewrite of the High Level API using the new HAL model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new HAL model need the High Level API to be rewritten. This is the first version of this rewrite, still in progress but should work. Change-Id: I5c94cf39d84cefae6b7a179c09d95e645673e8d4 Signed-off-by: Loïc Collignon --- conf.d/cmake/config.cmake | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'conf.d/cmake') diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index b89c5ed..31fb7bf 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -1,7 +1,7 @@ ########################################################################### -# Copyright 2017 Audiokinetic +# Copyright 2018 IoT.bzh # -# author: Tai Vuong +# author: Loïc Collignon # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,13 +18,13 @@ # Project Info # ------------------ -set(PROJECT_NAME agl-service-audio-4a) +set(PROJECT_NAME 4a-hl-service-audio) set(PROJECT_VERSION "1.0") set(PROJECT_PRETTY_NAME "Audio High Level Binding") set(PROJECT_DESCRIPTION "AGL High Level Interface for Audio") set(PROJECT_ICON "icon.png") -set(PROJECT_AUTHOR "Tai, Vuong") -set(PROJECT_AUTHOR_MAIL "tvuong@audiokinetic.com") +set(PROJECT_AUTHOR "Collignon, Loïc") +set(PROJECT_AUTHOR_MAIL "loic.collignon@iot.bzh") set(PROJECT_LICENCE "APL2.0") set(PROJECT_LANGUAGES,"C") @@ -37,12 +37,10 @@ set(PROJECT_SRC_DIR_PATTERN "[^_]*") # Compilation Mode (DEBUG, RELEASE) # ---------------------------------- -set(CMAKE_BUILD_TYPE "DEBUG") # Alsa does not really like libEfence set(USE_EFENCE 0) - # Compiler selection if needed. Overload the detected compiler. # ----------------------------------------------- set (gcc_minimal_version 4.9) @@ -63,6 +61,7 @@ set (PKG_REQUIRED_LIST json-c libafbwsc glib-2.0 + lua>=5.3 ) # Compilation options definition @@ -88,7 +87,10 @@ set(COMPILE_OPTIONS -DMAX_LINEAR_DB_SCALE=24 # until 24db volume normalisation use a simple linear scale -DTLV_BYTE_SIZE=256 # Alsa use 4096 as default but 256 should fit most sndcards -DCONTROL_MAXPATH_LEN=255 --DCONTROL_CONFIG_PATH="${CMAKE_SOURCE_DIR}/conf.d/project:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}" +-DCONTROL_CONFIG_PATH="${CMAKE_CURRENT_BINARY_DIR}/package/etc:${CMAKE_SOURCE_DIR}/conf.d/project:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}" +-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lib:${CMAKE_BINARY_DIR}/package/lib/plugins" +-DCONTROL_LUA_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lua:${CMAKE_BINARY_DIR}/package/data" +-DUSE_API_DYN=1 CACHE STRING "Compilation flags") #set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.") #set(CXX_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C++ language.") @@ -96,6 +98,7 @@ set(COMPILE_OPTIONS #set(DEBUG_COMPILE_OPTIONS -g -ggdb -Wp,-U_FORTIFY_SOURCE CACHE STRING "Compilation flags for DEBUG build type.") #set(CCOV_COMPILE_OPTIONS -g -O2 --coverage CACHE STRING "Compilation flags for CCOV build type.") #set(RELEASE_COMPILE_OPTIONS -g -O2 CACHE STRING "Compilation flags for RELEASE build type.") +include_directories(${CMAKE_SOURCE_DIR}/controller/ctl-lib ${CMAKE_SOURCE_DIR}/afb-utilities) # Print a helper message when every thing is finished # ---------------------------------------------------- -- cgit 1.2.3-korg