diff options
| -rw-r--r-- | build.xml | 8 | ||||
| -rw-r--r-- | nbproject/project.properties | 22 |
2 files changed, 19 insertions, 11 deletions
@@ -9,7 +9,15 @@ <!-- in the project's Project Properties dialog box.--> <project name="jocl-demos" default="default" basedir="."> <description>Builds, tests, and runs the project jocl-demos.</description> + + <condition property="rootrel.build" value="build"> + <not> + <isset property="rootrel.build"/> + </not> + </condition> + <import file="nbproject/build-impl.xml"/> + <!-- There exist several targets which are by default empty and which can be diff --git a/nbproject/project.properties b/nbproject/project.properties index c1425c6..d6aa3bb 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,9 +1,9 @@ application.title=JOCL Demos application.vendor=jogamp -build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: -build.dir=build +build.dir=${rootrel.build} +build.classes.dir=${build.dir}/classes build.generated.dir=${build.dir}/generated build.generated.sources.dir=${build.dir}/generated-sources # Only compile against the classpath explicitly listed here: @@ -65,10 +65,10 @@ jocl.root=${basedir}/../jocl project.jocl=${jocl.root} reference.jocl.jar=${jocl.root}/dist/jocl.jar -file.reference.gluegen-rt.jar=${gluegen.root}/build/gluegen-rt.jar -file.reference.jogl.all.jar=${jogl.root}/build/jogl/jogl.all.jar -file.reference.nativewindow.all.jar=${jogl.root}/build/nativewindow/nativewindow.all.jar -file.reference.newt.all.jar=${jogl.root}/build/newt/newt.all.jar +file.reference.gluegen-rt.jar=${gluegen.root}/${rootrel.build}/gluegen-rt.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 run.classpath=\ ${javac.classpath}:\ @@ -78,11 +78,11 @@ run.classpath=\ # or test-sys-prop.name=value to set system properties for unit tests): #-verbose:jni run.jvmargs=-Djava.library.path="\ - ${jocl.root}/build/natives/jocl:\ - ${jogl.root}/build/jogl/obj:\ - ${jogl.root}/build/nativewindow/obj:\ - ${jogl.root}/build/newt/obj:\ - ${gluegen.root}/build/obj" + ${jocl.root}/${rootrel.build}/natives/jocl:\ + ${jogl.root}/${rootrel.build}/jogl/obj:\ + ${jogl.root}/${rootrel.build}/nativewindow/obj:\ + ${jogl.root}/${rootrel.build}/newt/obj:\ + ${gluegen.root}/${rootrel.build}/obj" run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} |