diff options
Diffstat (limited to 'nbproject')
| -rw-r--r-- | nbproject/configurations.xml | 212 | ||||
| -rw-r--r-- | nbproject/project.xml | 2 |
2 files changed, 104 insertions, 110 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 0e58cd5..c02fba8 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -9,20 +9,6 @@ <in>Alsa-SetGet.c</in> <in>Alsa-Ucm.c</in> </df> - <df name="build"> - <df name="CMakeFiles"> - <df name="3.5.2"> - <df name="CompilerIdC"> - <in>CMakeCCompilerId.c</in> - </df> - <df name="CompilerIdCXX"> - <in>CMakeCXXCompilerId.cpp</in> - </df> - </df> - <in>feature_tests.c</in> - <in>feature_tests.cxx</in> - </df> - </df> <df name="Common"> <in>AudioCommonLib.c</in> </df> @@ -82,17 +68,18 @@ </sourceRootList> <projectmakefile>Build/Makefile</projectmakefile> <confs> - <conf name="Default" type="0"> + <conf name="Amixer-Dhw_4" type="0"> <toolsSet> <compilerSet>GNU|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> <rebuildPropChanged>false</rebuildPropChanged> </toolsSet> <flagsDictionary> - <element flagsID="0" commonFlags="-fPIC -fPIC"/> - <element flagsID="1" commonFlags="-g -fPIC -fPIC -g"/> + <element flagsID="0" commonFlags="-g -fPIC -fPIC -g"/> + <element flagsID="1" commonFlags="-g -ggdb -fPIC -fPIC"/> <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/> <element flagsID="3" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/> + <element flagsID="4" commonFlags="-mtune=generic -march=x86-64 -g -ggdb -fPIC"/> </flagsDictionary> <codeAssistance> <includeAdditional>true</includeAdditional> @@ -111,24 +98,37 @@ </preBuild> </makefileType> <item path="ALSA-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="1"> <incDir> + <pElem>../../../opt/include</pElem> <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>Shared-Interface</pElem> <pElem>build/ALSA-afb</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> </item> <item path="ALSA-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="4"> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>ALSA-afb</pElem> <pElem>build/ALSA-afb</pElem> </incDir> </cTool> </item> <item path="ALSA-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="4"> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>ALSA-afb</pElem> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> <pElem>build/ALSA-afb</pElem> @@ -136,8 +136,10 @@ </cTool> </item> <item path="ALSA-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="4"> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>ALSA-afb</pElem> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> <pElem>build/ALSA-afb</pElem> @@ -145,8 +147,10 @@ </cTool> </item> <item path="ALSA-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="4"> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>ALSA-afb</pElem> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> <pElem>../../../opt/include</pElem> @@ -155,66 +159,48 @@ </cTool> </item> <item path="Common/AudioCommonLib.c" ex="false" tool="0" flavor2="2"> - <cTool flags="1"> + <cTool flags="0"> </cTool> </item> <item path="HAL-afb/HAL-interface/hal-interface.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="1"> </cTool> </item> - <item path="HAL-afb/HAL-plugin/HalPlugCb.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <item path="HAL-afb/HAL-plugin/HalPlugCb.c" ex="false" tool="0" flavor2="3"> + <cTool flags="4"> <incDir> <pElem>../../../opt/include</pElem> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/p11-kit-1</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/HAL-afb/HAL-plugin</pElem> </incDir> - <preprocessorList> - <Elem>PIC</Elem> - <Elem>cb_sample_EXPORTS</Elem> - </preprocessorList> </cTool> </item> <item path="HAL-afb/HAL-plugin/HalPlugCtl.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> + <cTool flags="4"> <incDir> - <pElem>../../../opt/include/afb</pElem> <pElem>../../../opt/include</pElem> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/p11-kit-1</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/HAL-afb/HAL-plugin</pElem> </incDir> - <preprocessorList> - <Elem>PIC</Elem> - <Elem>ctl_afbhal_EXPORTS</Elem> - </preprocessorList> </cTool> </item> <item path="HAL-afb/HAL-plugin/HalPlugPcm.c" ex="false" tool="0" flavor2="3"> <cTool flags="2"> <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>HAL-afb/HAL-plugin</pElem> - <pElem>../../../opt/include/alsa</pElem> <pElem>build/HAL-afb/HAL-plugin</pElem> </incDir> </cTool> </item> <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="4"> </cTool> </item> <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="4"> </cTool> </item> <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3"> @@ -271,17 +257,9 @@ <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="2"> + <cTool flags="4"> </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> @@ -312,18 +290,29 @@ <folder path="0/HAL-afb/HAL-interface"> <cTool> <incDir> - <pElem>HAL-afb/HAL-interface</pElem> + <pElem>../../../opt/include</pElem> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>HAL-afb/HAL-interface</pElem> <pElem>Shared-Interface</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL-interface</pElem> </incDir> </cTool> </folder> + <folder path="0/HAL-afb/HAL-plugin"> + <cTool> + <incDir> + <pElem>HAL-afb/HAL-plugin</pElem> + <pElem>../../../opt/include/alsa</pElem> + </incDir> + </cTool> + </folder> <folder path="0/HAL-afb/HDA-intel"> <cTool> <incDir> <pElem>HAL-afb/HDA-intel</pElem> + <pElem>../../../opt/include/alsa</pElem> <pElem>Shared-Interface</pElem> <pElem>HAL-afb/HAL-interface</pElem> <pElem>../../../opt/include</pElem> @@ -335,6 +324,7 @@ <cTool> <incDir> <pElem>HAL-afb/Scarlett-Focusrite</pElem> + <pElem>../../../opt/include/alsa</pElem> <pElem>Shared-Interface</pElem> <pElem>HAL-afb/HAL-interface</pElem> <pElem>../../../opt/include</pElem> @@ -648,7 +638,6 @@ <element flagsID="1" commonFlags="-g -ggdb -fPIC -fPIC"/> <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/> <element flagsID="3" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/> - <element flagsID="4" commonFlags="-mtune=generic -march=x86-64 -g -ggdb -fPIC"/> </flagsDictionary> <codeAssistance> <includeAdditional>true</includeAdditional> @@ -667,47 +656,23 @@ </preBuild> </makefileType> <item path="ALSA-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> - <incDir> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>build/ALSA-afb</pElem> - </incDir> + <cTool flags="1"> </cTool> </item> <item path="ALSA-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> - <incDir> - <pElem>build/ALSA-afb</pElem> - </incDir> + <cTool flags="1"> </cTool> </item> <item path="ALSA-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> - <incDir> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>build/ALSA-afb</pElem> - </incDir> + <cTool flags="1"> </cTool> </item> <item path="ALSA-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> - <incDir> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>build/ALSA-afb</pElem> - </incDir> + <cTool flags="1"> </cTool> </item> <item path="ALSA-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> - <incDir> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/ALSA-afb</pElem> - </incDir> + <cTool flags="1"> </cTool> </item> <item path="Common/AudioCommonLib.c" ex="false" tool="0" flavor2="2"> @@ -718,7 +683,7 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="4"> + <cTool flags="1"> </cTool> </item> <item path="HAL-afb/HAL-plugin/HalPlugCb.c" ex="false" tool="0" flavor2="3"> @@ -737,20 +702,23 @@ </cTool> </item> <item path="HAL-afb/HAL-plugin/HalPlugCtl.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> + <cTool flags="1"> <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>HAL-afb/HAL-plugin</pElem> - <pElem>../../../opt/include/alsa</pElem> <pElem>../../../opt/include</pElem> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/p11-kit-1</pElem> + <pElem>/usr/include/json-c</pElem> <pElem>build/HAL-afb/HAL-plugin</pElem> </incDir> + <preprocessorList> + <Elem>PIC</Elem> + <Elem>ctl_afbhal_EXPORTS</Elem> + </preprocessorList> </cTool> </item> <item path="HAL-afb/HAL-plugin/HalPlugPcm.c" ex="false" tool="0" flavor2="3"> <cTool flags="2"> <incDir> - <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL-plugin</pElem> <pElem>../../../opt/include/alsa</pElem> <pElem>build/HAL-afb/HAL-plugin</pElem> @@ -758,14 +726,14 @@ </cTool> </item> <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> + <cTool flags="1"> </cTool> </item> <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> + <cTool flags="1"> </cTool> </item> <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3"> @@ -822,15 +790,25 @@ <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="4"> + <cTool flags="1"> </cTool> </item> <folder path="0/ALSA-afb"> <cTool> <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>ALSA-afb</pElem> + <pElem>../../../opt/include</pElem> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/p11-kit-1</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>Shared-Interface</pElem> + <pElem>build/ALSA-afb</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/Common"> @@ -863,11 +841,12 @@ <folder path="0/HAL-afb/HAL-interface"> <cTool> <incDir> - <pElem>HAL-afb/HAL-interface</pElem> + <pElem>../../../opt/include</pElem> <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>HAL-afb/HAL-interface</pElem> <pElem>Shared-Interface</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL-interface</pElem> </incDir> </cTool> @@ -875,25 +854,33 @@ <folder path="0/HAL-afb/HDA-intel"> <cTool> <incDir> - <pElem>HAL-afb/HDA-intel</pElem> + <pElem>../../../opt/include</pElem> <pElem>../../../opt/include/alsa</pElem> - <pElem>Shared-Interface</pElem> + <pElem>/usr/include/p11-kit-1</pElem> + <pElem>/usr/include/json-c</pElem> <pElem>HAL-afb/HAL-interface</pElem> - <pElem>../../../opt/include</pElem> + <pElem>Shared-Interface</pElem> <pElem>build/HAL-afb/HDA-intel</pElem> </incDir> + <preprocessorList> + <Elem>hal_intel_hda_EXPORTS</Elem> + </preprocessorList> </cTool> </folder> <folder path="0/HAL-afb/Scarlett-Focusrite"> <cTool> <incDir> - <pElem>HAL-afb/Scarlett-Focusrite</pElem> + <pElem>../../../opt/include</pElem> <pElem>../../../opt/include/alsa</pElem> - <pElem>Shared-Interface</pElem> + <pElem>/usr/include/p11-kit-1</pElem> + <pElem>/usr/include/json-c</pElem> <pElem>HAL-afb/HAL-interface</pElem> - <pElem>../../../opt/include</pElem> + <pElem>Shared-Interface</pElem> <pElem>build/HAL-afb/Scarlett-Focusrite</pElem> </incDir> + <preprocessorList> + <Elem>hal_scalett_usb_EXPORTS</Elem> + </preprocessorList> </cTool> </folder> <folder path="0/HighLevel-afb"> @@ -907,11 +894,18 @@ <folder path="0/Shared-Interface"> <cTool> <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>Shared-Interface</pElem> + <pElem>../../../opt/include</pElem> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>Shared-Interface</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> diff --git a/nbproject/project.xml b/nbproject/project.xml index b9aee19..442a905 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -14,7 +14,7 @@ </sourceRootList> <confList> <confElem> - <name>Default</name> + <name>Amixer-Dhw_4</name> <type>0</type> </confElem> <confElem> |