summaryrefslogtreecommitdiffstats
path: root/nbproject
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-04-16 04:45:04 +0200
committerSven Gothel <[email protected]>2010-04-16 04:45:04 +0200
commit3d8679872f38a56026d87838451eb84da54509f6 (patch)
tree0c2c3353a2f0d8271fe284f09890ff73c578e663 /nbproject
parentbb028021be2714e66d9b1062298a3e308c649c56 (diff)
parentd1327d8932c2bd5d51fd39fefe7486544d71f7c5 (diff)
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to 'nbproject')
-rwxr-xr-xnbproject/project.xml17
1 files changed, 14 insertions, 3 deletions
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 9f8a897bd..f1a94a2a5 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -47,6 +47,12 @@
<location>src/nativewindow/classes</location>
<encoding>UTF-8</encoding>
</source-folder>
+ <source-folder>
+ <label>src/junit</label>
+ <type>java</type>
+ <location>src/junit</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
</folders>
<ide-actions>
<action name="build">
@@ -112,6 +118,10 @@
<label>nativewindow</label>
<location>src/nativewindow/classes</location>
</source-folder>
+ <source-folder style="packages">
+ <label>src/junit</label>
+ <location>src/junit</location>
+ </source-folder>
<source-file>
<location>${ant.script}</location>
</source-file>
@@ -130,12 +140,13 @@
<compilation-unit>
<package-root>src/newt/classes</package-root>
<package-root>src/jogl/classes</package-root>
- <package-root>build/jogl/gensrc/classes</package-root>
<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.jar</classpath>
+ <package-root>src/junit</package-root>
+ <classpath mode="compile">../gluegen/build/gluegen-rt.jar:../gluegen/make/lib/junit-4.5.jar</classpath>
<built-to>bin</built-to>
- <source-level>1.4</source-level>
+ <source-level>1.5</source-level>
</compilation-unit>
</java-data>
</configuration>