diff options
Diffstat (limited to 'nbproject')
| -rw-r--r-- | nbproject/configurations.xml | 219 | ||||
| -rw-r--r-- | nbproject/project.xml | 8 |
2 files changed, 112 insertions, 115 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 85f3fef..4bd0c69 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -107,7 +107,7 @@ </sourceRootList> <projectmakefile>Build/Makefile</projectmakefile> <confs> - <conf name="Local_Raw_Controller" type="0"> + <conf name="Speaker-Test_Mumtimedia" type="0"> <toolsSet> <compilerSet>GNU|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> @@ -445,13 +445,22 @@ <item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4"> </item> <item path="afb-utilities/filescan-utils.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="0"> <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>afb-utilities</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include</pElem> + <pElem>/usr/include/p11-kit-1</pElem> + <pElem>../../../opt/include/alsa</pElem> + <pElem>afb-utilities</pElem> <pElem>build/afb-utilities</pElem> </incDir> + <preprocessorList> + <Elem>CONTROL_MAXPATH_LEN=255</Elem> + <Elem>MAX_LINEAR_DB_SCALE=24</Elem> + <Elem>MAX_SND_CARD=16</Elem> + <Elem>NATIVE_LINUX</Elem> + <Elem>TLV_BYTE_SIZE=256</Elem> + </preprocessorList> </cTool> </item> <item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="3"> @@ -464,57 +473,61 @@ </cTool> </item> <item path="alsa-binding/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> + <cTool flags="2"> + <incDir> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include</pElem> + <pElem>build/alsa-binding</pElem> + </incDir> </cTool> </item> <item path="alsa-binding/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> + <cTool flags="2"> + <incDir> + <pElem>/usr/include/json-c</pElem> + <pElem>build/alsa-binding</pElem> + </incDir> </cTool> </item> <item path="alsa-binding/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> + <cTool flags="2"> + <incDir> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include</pElem> + <pElem>build/alsa-binding</pElem> + </incDir> </cTool> </item> <item path="alsa-binding/Alsa-SetGet.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> - </cTool> - </item> - <item path="alsa-binding/Alsa-Ucm.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> - </cTool> - </item> - <item path="alsa-hook/PolicyAlsaHook.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> + <cTool flags="2"> <incDir> + <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> <pElem>../../../opt/include</pElem> - <pElem>/usr/include/p11-kit-1</pElem> - <pElem>../../../opt/include/alsa</pElem> - <pElem>build/alsa-hook</pElem> + <pElem>build/alsa-binding</pElem> </incDir> - <preprocessorList> - <Elem>CONTROL_MAXPATH_LEN=255</Elem> - <Elem>MAX_LINEAR_DB_SCALE=24</Elem> - <Elem>MAX_SND_CARD=16</Elem> - <Elem>NATIVE_LINUX</Elem> - <Elem>PIC</Elem> - <Elem>TLV_BYTE_SIZE=256</Elem> - <Elem>policy_alsa_hook_EXPORTS</Elem> - </preprocessorList> </cTool> </item> - <item path="alsa-hook/PolicyHookTcp.c" ex="false" tool="0" flavor2="3"> + <item path="alsa-binding/Alsa-Ucm.c" ex="false" tool="0" flavor2="3"> <cTool flags="2"> <incDir> - <pElem>alsa-hook</pElem> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>../../../opt/include/afb</pElem> <pElem>../../../opt/include</pElem> - <pElem>build/alsa-hook</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> + <item path="alsa-hook/PolicyAlsaHook.c" ex="false" tool="0" flavor2="3"> + <cTool flags="2"> + </cTool> + </item> + <item path="alsa-hook/PolicyHookTcp.c" ex="false" tool="0" flavor2="3"> + <cTool flags="2"> + </cTool> + </item> <folder path="0/Audio-Common"> <cTool> <incDir> @@ -745,25 +758,25 @@ <folder path="0/alsa-binding"> <cTool> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>alsa-binding</pElem> + </incDir> + </cTool> + </folder> + <folder path="0/alsa-hook"> + <cTool> + <incDir> + <pElem>alsa-hook</pElem> + <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include/afb</pElem> <pElem>../../../opt/include</pElem> - <pElem>/usr/include/p11-kit-1</pElem> - <pElem>../../../opt/include/alsa</pElem> - <pElem>afb-utilities</pElem> - <pElem>build/alsa-binding</pElem> + <pElem>build/alsa-hook</pElem> </incDir> - <preprocessorList> - <Elem>CONTROL_MAXPATH_LEN=255</Elem> - <Elem>MAX_LINEAR_DB_SCALE=24</Elem> - <Elem>MAX_SND_CARD=16</Elem> - <Elem>NATIVE_LINUX</Elem> - <Elem>TLV_BYTE_SIZE=256</Elem> - <Elem>alsa_4a_EXPORTS</Elem> - </preprocessorList> </cTool> </folder> </conf> - <conf name="Local_Alias" type="0"> + <conf name="Afb-Daemon_Basic" type="0"> <toolsSet> <compilerSet>GNU|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> @@ -783,7 +796,7 @@ <makefileType> <makeTool> <buildCommandWorkingDir>build</buildCommandWorkingDir> - <buildCommand>${MAKE} -f Makefile install</buildCommand> + <buildCommand>${MAKE} -f Makefile populate</buildCommand> <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> <executablePath>build/CMakeFiles/feature_tests.bin</executablePath> <cTool flags="2"> @@ -792,6 +805,7 @@ <preBuild> <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir> <preBuildCommand>cmake ..</preBuildCommand> + <preBuildFirst>true</preBuildFirst> </preBuild> </makefileType> <item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3"> @@ -888,7 +902,6 @@ <cTool flags="2"> <incDir> <pElem>Audio-Common</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL-interface</pElem> </incDir> </cTool> @@ -923,11 +936,8 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>Audio-Common</pElem> <pElem>HAL-afb/HAL-interface</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> </incDir> </cTool> @@ -937,10 +947,6 @@ tool="1" flavor2="4"> <ccTool flags="1"> - <incDir> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> - </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp" @@ -948,10 +954,6 @@ tool="1" flavor2="4"> <ccTool flags="1"> - <incDir> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> - </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp" @@ -959,10 +961,6 @@ tool="1" flavor2="4"> <ccTool flags="1"> - <incDir> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> - </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp" @@ -970,10 +968,6 @@ tool="1" flavor2="4"> <ccTool flags="1"> - <incDir> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> - </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/wrap-json.c" @@ -983,7 +977,6 @@ <cTool flags="2"> <incDir> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> </incDir> </cTool> @@ -996,7 +989,6 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> </incDir> </cTool> @@ -1115,16 +1107,16 @@ <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> <item path="alsa-binding/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3"> <cTool flags="2"> <incDir> - <pElem>build/Alsa-afb</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> @@ -1133,9 +1125,8 @@ <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> @@ -1144,9 +1135,8 @@ <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> @@ -1155,12 +1145,15 @@ <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> + <item path="alsa-hook/PolicyAlsaHook.c" ex="false" tool="0" flavor2="3"> + <cTool flags="2"> + </cTool> + </item> <folder path="0/Common"> <cTool> <incDir> @@ -1399,12 +1392,24 @@ <cTool> <incDir> <pElem>../../../opt/include/afb</pElem> - <pElem>Alsa-afb</pElem> + <pElem>alsa-binding</pElem> + </incDir> + </cTool> + </folder> + <folder path="0/alsa-hook"> + <cTool> + <incDir> + <pElem>alsa-hook</pElem> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include/afb</pElem> + <pElem>../../../opt/include</pElem> + <pElem>build/alsa-hook</pElem> </incDir> </cTool> </folder> </conf> - <conf name="Local-Ctl" type="0"> + <conf name="Afb-Daemon__HAL_" type="0"> <toolsSet> <compilerSet>GNU|GNU</compilerSet> <dependencyChecking>false</dependencyChecking> @@ -1433,6 +1438,7 @@ <preBuild> <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir> <preBuildCommand>cmake ..</preBuildCommand> + <preBuildFirst>true</preBuildFirst> </preBuild> </makefileType> <item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3"> @@ -1529,7 +1535,6 @@ <cTool flags="2"> <incDir> <pElem>Audio-Common</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL-interface</pElem> </incDir> </cTool> @@ -1564,11 +1569,8 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>Audio-Common</pElem> <pElem>HAL-afb/HAL-interface</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> </incDir> </cTool> @@ -1578,10 +1580,6 @@ tool="1" flavor2="4"> <ccTool flags="1"> - <incDir> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> - </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp" @@ -1589,10 +1587,6 @@ tool="1" flavor2="4"> <ccTool flags="1"> - <incDir> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> - </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp" @@ -1600,10 +1594,6 @@ tool="1" flavor2="4"> <ccTool flags="1"> - <incDir> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> - </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp" @@ -1611,10 +1601,6 @@ tool="1" flavor2="4"> <ccTool flags="1"> - <incDir> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> - </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/wrap-json.c" @@ -1624,7 +1610,6 @@ <cTool flags="2"> <incDir> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> </incDir> </cTool> @@ -1637,7 +1622,6 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> </incDir> </cTool> @@ -1756,16 +1740,16 @@ <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> <item path="alsa-binding/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3"> <cTool flags="2"> <incDir> - <pElem>build/Alsa-afb</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> @@ -1774,9 +1758,8 @@ <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> @@ -1785,9 +1768,8 @@ <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> @@ -1796,12 +1778,15 @@ <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> + <pElem>build/alsa-binding</pElem> </incDir> </cTool> </item> + <item path="alsa-hook/PolicyAlsaHook.c" ex="false" tool="0" flavor2="3"> + <cTool flags="2"> + </cTool> + </item> <folder path="0/Common"> <cTool> <incDir> @@ -2040,7 +2025,19 @@ <cTool> <incDir> <pElem>../../../opt/include/afb</pElem> - <pElem>Alsa-afb</pElem> + <pElem>alsa-binding</pElem> + </incDir> + </cTool> + </folder> + <folder path="0/alsa-hook"> + <cTool> + <incDir> + <pElem>alsa-hook</pElem> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include/afb</pElem> + <pElem>../../../opt/include</pElem> + <pElem>build/alsa-hook</pElem> </incDir> </cTool> </folder> diff --git a/nbproject/project.xml b/nbproject/project.xml index fa21507..89a149f 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -6,7 +6,7 @@ <name>alsa-4a</name> <c-extensions>c</c-extensions> <cpp-extensions>cpp,cxx</cpp-extensions> - <header-extensions>h,hpp</header-extensions> + <header-extensions>h</header-extensions> <sourceEncoding>UTF-8</sourceEncoding> <make-dep-projects/> <sourceRootList> @@ -14,15 +14,15 @@ </sourceRootList> <confList> <confElem> - <name>Local_Raw_Controller</name> + <name>Speaker-Test_Mumtimedia</name> <type>0</type> </confElem> <confElem> - <name>Local_Alias</name> + <name>Afb-Daemon_Basic</name> <type>0</type> </confElem> <confElem> - <name>Local-Ctl</name> + <name>Afb-Daemon__HAL_</name> <type>0</type> </confElem> </confList> |