diff options
Diffstat (limited to 'nbproject')
| -rw-r--r-- | nbproject/configurations.xml | 82 |
1 files changed, 54 insertions, 28 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index c1f4a61..02884db 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -8,6 +8,9 @@ <in>Alsa-SetGet.c</in> <in>Alsa-Ucm.c</in> </df> + <df name="Common"> + <in>AudioCommonLib.c</in> + </df> <df name="HAL-afb"> <df name="HAL-interface"> <in>hal-interface.c</in> @@ -74,7 +77,7 @@ <buildCommandWorkingDir>build</buildCommandWorkingDir> <buildCommand>${MAKE} -f Makefile</buildCommand> <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> - <executablePath></executablePath> + <executablePath>build/CMakeFiles/feature_tests.bin</executablePath> </makeTool> <preBuild> <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir> @@ -82,19 +85,38 @@ <preBuildFirst>true</preBuildFirst> </preBuild> </makefileType> - <item path="ALSA-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="0"> - <cTool flags="0"> + <item path="ALSA-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3"> + <cTool flags="1"> + <incDir> + <pElem>/usr/include/json-c</pElem> + <pElem>build/ALSA-afb</pElem> + </incDir> </cTool> </item> <item path="ALSA-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> + <cTool flags="1"> + <incDir> + <pElem>build/ALSA-afb</pElem> + </incDir> </cTool> </item> <item path="ALSA-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> + <cTool flags="1"> + <incDir> + <pElem>/usr/include/json-c</pElem> + <pElem>build/ALSA-afb</pElem> + </incDir> </cTool> </item> <item path="ALSA-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3"> + <cTool flags="1"> + <incDir> + <pElem>/usr/include/json-c</pElem> + <pElem>build/ALSA-afb</pElem> + </incDir> + </cTool> + </item> + <item path="Common/AudioCommonLib.c" ex="false" tool="0" flavor2="2"> <cTool flags="0"> </cTool> </item> @@ -102,11 +124,11 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="0"> </cTool> </item> <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="0"> </cTool> </item> <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3"> @@ -163,40 +185,51 @@ <item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4"> </item> <item path="Shared-Interface/audio-interface.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> + <cTool flags="1"> </cTool> </item> <folder path="0/ALSA-afb"> <cTool> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>ALSA-afb</pElem> + </incDir> + </cTool> + </folder> + <folder path="0/Common"> + <cTool> + <incDir> <pElem>/usr/include/alsa</pElem> <pElem>../../../opt/include</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>Shared-Interface</pElem> - <pElem>build/ALSA-afb</pElem> + <pElem>build/Common</pElem> </incDir> <preprocessorList> <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem> <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem> <Elem>MAX_SND_CARD=16</Elem> - <Elem>alsa_lowlevel_EXPORTS</Elem> </preprocessorList> </cTool> </folder> <folder path="0/HAL-afb"> <cTool> <incDir> - <pElem>../../../opt/include/afb</pElem> + <pElem>/usr/include/alsa</pElem> + <pElem>../../../opt/include</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>HAL-afb/HAL-interface</pElem> + <pElem>Shared-Interface</pElem> </incDir> + <preprocessorList> + <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem> + <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem> + <Elem>MAX_SND_CARD=16</Elem> + </preprocessorList> </cTool> </folder> <folder path="0/HAL-afb/HAL-interface"> <cTool> <incDir> - <pElem>HAL-afb/HAL-interface</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>Shared-Interface</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL-interface</pElem> </incDir> </cTool> @@ -204,12 +237,11 @@ <folder path="0/HAL-afb/HDA-intel"> <cTool> <incDir> - <pElem>HAL-afb/HDA-intel</pElem> - <pElem>Shared-Interface</pElem> - <pElem>HAL-afb/HAL-interface</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HDA-intel</pElem> </incDir> + <preprocessorList> + <Elem>hal_intel_hda_EXPORTS</Elem> + </preprocessorList> </cTool> </folder> <folder path="0/HighLevel-afb"> @@ -223,17 +255,11 @@ <folder path="0/Shared-Interface"> <cTool> <incDir> - <pElem>/usr/include/alsa</pElem> - <pElem>../../../opt/include</pElem> - <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include/afb</pElem> <pElem>Shared-Interface</pElem> + <pElem>/usr/include/json-c</pElem> <pElem>build/Shared-Interface</pElem> </incDir> - <preprocessorList> - <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem> - <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem> - <Elem>MAX_SND_CARD=16</Elem> - </preprocessorList> </cTool> </folder> </conf> |