nbprojects up

diff --git a/NB-Projects/lib/nbproject/Makefile-Default.mk b/NB-Projects/lib/nbproject/Makefile-Default.mk
index 13e9a3d..0f38074 100644 (file)
--- a/NB-Projects/lib/nbproject/Makefile-Default.mk
+++ b/NB-Projects/lib/nbproject/Makefile-Default.mk
@@ -50,7 +50,7 @@ LDLIBSOPTIONS=
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-       cd /mnt/extra/home/patrik/gits/libbear && ${MAKE} lib
+       cd /mnt/extra/home/patrik/gits/libbear && ${MAKE} all-lib
 
 # Subprojects
 .build-subprojects:

diff --git a/NB-Projects/lib/nbproject/configurations.xml b/NB-Projects/lib/nbproject/configurations.xml
index d28ae35..c531f87 100644 (file)
--- a/NB-Projects/lib/nbproject/configurations.xml
+++ b/NB-Projects/lib/nbproject/configurations.xml
@@ -1,18 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configurationDescriptor version="62">
   <logicalFolder name="root" displayName="root" projectFiles="true">
-    <df name="inc" root="/mnt/extra/home/patrik/gits/libbear/lib/inc">
-      <in>Autolock.h</in>
-      <in>Lock.h</in>
-      <in>Ticks.h</in>
-      <in>Timer.h</in>
-      <in>Vector2.h</in>
-      <in>debug.h</in>
-      <in>mathw.h</in>
+    <df name="include" root="/mnt/extra/home/patrik/gits/libbear/lib/include">
+      <df name="bear">
+        <in>Autolock.h</in>
+        <in>Lock.h</in>
+        <in>Queue.h</in>
+        <in>Set.h</in>
+        <in>Ticks.h</in>
+        <in>Timer.h</in>
+        <in>Vector2.h</in>
+        <in>debug.h</in>
+        <in>mathw.h</in>
+      </df>
     </df>
     <df name="src" root="/mnt/extra/home/patrik/gits/libbear/lib/src">
       <df name="locks">
+        <in>Autolock.cpp</in>
+        <in>Lock.cpp</in>
       </df>
+      <in>Ticks.cpp</in>
+      <in>Timer.cpp</in>
+      <in>Vector2.cpp</in>
+      <in>debug.cpp</in>
+      <in>mathw.cpp</in>
     </df>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -23,7 +34,7 @@
   </logicalFolder>
   <sourceRootList>
     <Elem>/mnt/extra/home/patrik/gits/libbear/lib/src</Elem>
-    <Elem>/mnt/extra/home/patrik/gits/libbear/lib/inc</Elem>
+    <Elem>/mnt/extra/home/patrik/gits/libbear/lib/include</Elem>
   </sourceRootList>
   <projectmakefile>lib-Makefile.mk</projectmakefile>
   <confs>
@@ -36,13 +47,13 @@
       <makefileType>
         <makeTool>
           <buildCommandWorkingDir>/mnt/extra/home/patrik/gits/libbear</buildCommandWorkingDir>
-          <buildCommand>${MAKE} lib</buildCommand>
+          <buildCommand>${MAKE} all-lib</buildCommand>
           <cleanCommand>${MAKE} clean</cleanCommand>
           <executablePath></executablePath>
           <ccTool>
             <incDir>
-              <pElem>/mnt/extra/home/patrik/gits/libbear/lib/inc</pElem>
-              <pElem>/mnt/extra/home/patrik/gits/libbear/lib</pElem>
+              <pElem>/mnt/extra/home/patrik/gits/libbear/lib/include/bear</pElem>
+              <pElem>/mnt/extra/home/patrik/gits/libbear/lib/src</pElem>
             </incDir>
           </ccTool>
         </makeTool>

diff --git a/NB-Projects/lib/nbproject/private/private.xml b/NB-Projects/lib/nbproject/private/private.xml
index 0c2218f..bf91c93 100644 (file)
--- a/NB-Projects/lib/nbproject/private/private.xml
+++ b/NB-Projects/lib/nbproject/private/private.xml
@@ -3,4 +3,5 @@
     <code-assistance-data xmlns="http://www.netbeans.org/ns/make-project-private/1">
         <code-model-enabled>true</code-model-enabled>
     </code-assistance-data>
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
 </project-private>