1 files changed, 52 insertions, 19 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 5d4dfd9..9bf2285 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -35,6 +35,7 @@
         <in>libmostvolume.cpp</in>
       </df>
       <df name="ucs2-afb">
+        <in>ucs_apihat.c</in>
         <in>ucs_binding.c</in>
         <in>ucs_binding.new.c</in>
       </df>
@@ -201,23 +202,12 @@
       </folder>
       <folder path="0/ucs2-afb">
         <cTool>
-          <incDir>
-            <pElem>../../../opt/include</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>ucs2-interface</pElem>
-            <pElem>ucs2-lib/inc</pElem>
-            <pElem>ucs2-lib/cfg</pElem>
-            <pElem>ucs2-lib/src/ucs-xml</pElem>
-            <pElem>ucs2-vol/inc</pElem>
-            <pElem>ucs2-vol/cfg</pElem>
-            <pElem>ucs2-vol/src/ucs-xml</pElem>
-            <pElem>build/ucs2-afb</pElem>
-          </incDir>
           <preprocessorList>
             <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
             <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
             <Elem>_REENTRANT</Elem>
             <Elem>_THREAD_SAFE</Elem>
+            <Elem>ucs2_afb_EXPORTS</Elem>
           </preprocessorList>
         </cTool>
       </folder>
@@ -282,21 +272,55 @@
           </preprocessorList>
         </ccTool>
       </folder>
+      <item path="ucs2-afb/ucs_apihat.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="1">
+          <incDir>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>ucs2-interface</pElem>
+            <pElem>ucs2-lib/unicens/inc</pElem>
+            <pElem>ucs2-lib/cfg_agl</pElem>
+            <pElem>ucs2-vol/inc</pElem>
+            <pElem>ucs2-vol/cfg</pElem>
+            <pElem>ucs2-vol/src/ucs-xml</pElem>
+            <pElem>build/ucs2-afb</pElem>
+          </incDir>
+        </cTool>
+      </item>
       <item path="ucs2-afb/ucs_binding.c" ex="false" tool="0" flavor2="3">
         <cTool flags="1">
-          <preprocessorList>
-            <Elem>ucs2_EXPORTS</Elem>
-          </preprocessorList>
+          <incDir>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>ucs2-interface</pElem>
+            <pElem>ucs2-lib/unicens/inc</pElem>
+            <pElem>ucs2-lib/cfg_agl</pElem>
+            <pElem>ucs2-vol/inc</pElem>
+            <pElem>ucs2-vol/cfg</pElem>
+            <pElem>ucs2-vol/src/ucs-xml</pElem>
+            <pElem>build/ucs2-afb</pElem>
+          </incDir>
         </cTool>
       </item>
       <item path="ucs2-afb/ucs_binding.new.c" ex="false" tool="0" flavor2="2">
         <cTool flags="1">
-          <preprocessorList>
-            <Elem>ucs2_afb_EXPORTS</Elem>
-          </preprocessorList>
+          <incDir>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>ucs2-interface</pElem>
+            <pElem>ucs2-lib/inc</pElem>
+            <pElem>ucs2-lib/cfg</pElem>
+            <pElem>ucs2-lib/src/ucs-xml</pElem>
+            <pElem>ucs2-vol/inc</pElem>
+            <pElem>ucs2-vol/cfg</pElem>
+            <pElem>ucs2-vol/src/ucs-xml</pElem>
+            <pElem>build/ucs2-afb</pElem>
+          </incDir>
         </cTool>
       </item>
-      <item path="ucs2-interface/ucs-xml/UcsXml.c" ex="false" tool="0" flavor2="0">
+      <item path="ucs2-interface/ucs-xml/UcsXml.c" ex="false" tool="0" flavor2="2">
         <cTool flags="1">
         </cTool>
       </item>
@@ -667,6 +691,15 @@
           </preprocessorList>
         </ccTool>
       </folder>
+      <item path="ucs2-afb/ucs_apihat.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="1">
+          <incDir>
+            <pElem>ucs2-afb</pElem>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>build/ucs2-afb</pElem>
+          </incDir>
+        </cTool>
+      </item>
       <item path="ucs2-afb/ucs_binding.c" ex="false" tool="0" flavor2="3">
         <cTool flags="1">
           <incDir>