From 55a60c28ca8f501aca0fff8c69b11564518f3a66 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 7 Nov 2010 02:34:19 +0100
Subject: Gluegen parts in src/gluegen (clean)

- Adding gluegen-gl.jar for GlueGen GL compile time parts.
- Removed dead build-gluegen.xml
- Adding com/jogamp/gluegen/runtime/opengl/* to jogl core
- Moved gluegen gl part to jogl/classes
---
 nbproject/project.xml | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'nbproject')

diff --git a/nbproject/project.xml b/nbproject/project.xml
index a3f1c61b8..ce6509193 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -13,20 +13,21 @@
             </properties>
             <folders>
                 <source-folder>
-                    <label>JOGL.GlueGen</label>
-                    <location>.</location>
+                    <label>nativewindow gensrc</label>
+                    <type>java</type>
+                    <location>build/nativewindow/gensrc/classes</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>jogl gensrc</label>
+                    <label>nativewindow</label>
                     <type>java</type>
-                    <location>build/jogl/gensrc/classes</location>
+                    <location>src/nativewindow/classes</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>nativewindow gensrc</label>
+                    <label>jogl gensrc</label>
                     <type>java</type>
-                    <location>build/nativewindow/gensrc/classes</location>
+                    <location>build/jogl/gensrc/classes</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
@@ -42,15 +43,14 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>nativewindow</label>
+                    <label>src/junit</label>
                     <type>java</type>
-                    <location>src/nativewindow/classes</location>
+                    <location>src/junit</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>src/junit</label>
-                    <type>java</type>
-                    <location>src/junit</location>
+                    <label>JOGL</label>
+                    <location>.</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
             </folders>
@@ -146,24 +146,28 @@
                 <type>folder</type>
                 <location>bin</location>
                 <script>${ant.script}</script>
-                <build-target>all</build-target>
+                <build-target>all.but-archives</build-target>
             </export>
             <export>
                 <type>folder</type>
                 <location>bin</location>
                 <script>${ant.script}</script>
-                <build-target>all</build-target>
+                <build-target>all.but-archives</build-target>
             </export>
             <view>
                 <items>
-                    <source-folder style="packages">
-                        <label>jogl gensrc</label>
-                        <location>build/jogl/gensrc/classes</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>nativewindow gensrc</label>
                         <location>build/nativewindow/gensrc/classes</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>nativewindow</label>
+                        <location>src/nativewindow/classes</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>jogl gensrc</label>
+                        <location>build/jogl/gensrc/classes</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>jogl</label>
                         <location>src/jogl/classes</location>
@@ -172,10 +176,6 @@
                         <label>newt</label>
                         <location>src/newt/classes</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>nativewindow</label>
-                        <location>src/nativewindow/classes</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>src/junit</label>
                         <location>src/junit</location>
@@ -201,7 +201,7 @@
                 <package-root>src/nativewindow/classes</package-root>
                 <package-root>build/jogl/gensrc/classes</package-root>
                 <package-root>build/nativewindow/gensrc/classes</package-root>
-                <classpath mode="compile">../gluegen/build/gluegen-rt.jar</classpath>
+                <classpath mode="compile">../gluegen/build/gluegen.jar:../gluegen/build/gluegen-rt.jar</classpath>
                 <built-to>bin</built-to>
                 <source-level>1.4</source-level>
             </compilation-unit>
-- 
cgit v1.2.3