diff options
| author | Sven Gothel <[email protected]> | 2011-08-22 02:33:17 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-08-22 02:33:17 +0200 |
| commit | d94a3cf5d3ce1984a0a2c488fa5020a936225ba5 (patch) | |
| tree | 655a7d81c17d204f8953d776a15039e1ffd4c7fe | |
| parent | 0babaf8cb71ec12db8eb0d2ae28e3e567fb73780 (diff) | |
Adapt to jogl commit 4dbb8731219212e27c9afb769a1c62b32bd230a6
| -rw-r--r-- | jocl.iml | 9 | ||||
| -rw-r--r-- | nbproject/project.properties | 12 |
2 files changed, 3 insertions, 18 deletions
@@ -31,15 +31,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jogl/build/nativewindow/nativewindow.all.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> <orderEntry type="library" name="junit" level="application" /> </component> </module> diff --git a/nbproject/project.properties b/nbproject/project.properties index 0214d3dd..65499e44 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -36,17 +36,13 @@ excludes= file.reference.junit-4.8.1.jar=lib/junit_4/junit-4.8.1.jar file.reference.gluegen-rt.jar=${gluegen.root}/${rootrel.build}/gluegen-rt.jar file.reference.gluegen.jar=${gluegen.root}/${rootrel.build}/gluegen.jar -file.reference.jogl.all.jar=${jogl.root}/${rootrel.build}/jogl/jogl.all.jar -file.reference.nativewindow.all.jar=${jogl.root}/${rootrel.build}/nativewindow/nativewindow.all.jar -file.reference.newt.all.jar=${jogl.root}/${rootrel.build}/newt/newt.all.jar +file.reference.jogl.all.jar=${jogl.root}/${rootrel.build}/jar/jogl.all.jar includes=** jar.compress=false javac.classpath=\ ${file.reference.gluegen-rt.jar}:\ - ${file.reference.jogl.all.jar}:\ - ${file.reference.newt.all.jar}:\ - ${file.reference.nativewindow.all.jar} + ${file.reference.jogl.all.jar} # Space-separated list of extra javac options javac.compilerargs=-Xlint javac.deprecation=true @@ -95,9 +91,7 @@ run.test.classpath=\ ${build.test.classes.dir} source.encoding=UTF-8 source.reference.gluegen-rt.jar=${gluegen.root}/src/java:${gluegen.root}/${rootrel.build}/gensrc/java -source.reference.jogl.all.jar=${jogl.root}/${rootrel.build}/jogl/classes -source.reference.nativewindow.all.jar=${jogl.root}/${rootrel.build}/nativewindow/gensrc/classes/ -source.reference.newt.all.jar=${jogl.root}/${rootrel.build}/newt/classes +source.reference.jogl.all.jar=${jogl.root}/${rootrel.build}/jogl/classes:${jogl.root}/${rootrel.build}/nativewindow/gensrc/classes/:${jogl.root}/${rootrel.build}/newt/classes src.dir=src src.java.dir=gensrc/java src.native.dir=gensrc/native |