From 2258d6eb97b7a1662ef236dea67d89899ff028ee Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 18 Dec 2011 23:37:00 +0100 Subject: Fix scripts ; Remove personalization of vendor -> Jogamp Community --- nbproject/project.properties | 5 ++++- scripts/make.jocl.all.linux-x86.sh | 4 ++-- scripts/make.jocl.all.solaris-x86.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index f9458c74..6dada473 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -9,7 +9,7 @@ annotation.processing.run.all.processors=true javac.processorpath=\ ${javac.classpath} application.title=JOCL -application.vendor=Michael Bien +application.vendor=JogAmp Community build.classes.excludes=**/*.java,**/*.jtemplate,**/*.form,**/*.c,**/*.html # This directory is removed when the project is cleaned: build.dir=${rootrel.build} @@ -80,6 +80,9 @@ run.classpath=\ # Space-separated list of JVM arguments used when running the project # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value # or test-sys-prop.name=value to set system properties for unit tests): +# -Djogamp.debug.NativeLibrary=true \ +# -Djogamp.debug=all \ +# run.jvmargs=${jvmDataModel.arg} -Xmx256m \ -Djava.library.path=\ "${basedir}/${rootrel.build}/natives/jocl${path.separator}\ diff --git a/scripts/make.jocl.all.linux-x86.sh b/scripts/make.jocl.all.linux-x86.sh index 1f497cf0..a5af57a6 100644 --- a/scripts/make.jocl.all.linux-x86.sh +++ b/scripts/make.jocl.all.linux-x86.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then + . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh fi ant \ diff --git a/scripts/make.jocl.all.solaris-x86.sh b/scripts/make.jocl.all.solaris-x86.sh index ed815144..ccfa2453 100644 --- a/scripts/make.jocl.all.solaris-x86.sh +++ b/scripts/make.jocl.all.solaris-x86.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then + . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh fi ant \ -- cgit v1.2.3