diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 3 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.macosx.sh | 4 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.x86.sh | 10 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.x86_64.sh | 10 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.cdcfp.macosx.sh | 10 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.cdcfp.x86.sh | 10 |
6 files changed, 22 insertions, 25 deletions
diff --git a/make/build.xml b/make/build.xml index d622819..29930c6 100644 --- a/make/build.xml +++ b/make/build.xml @@ -96,6 +96,7 @@ <target name="init" depends="jogamp.env.init,gluegen.cpptasks.detect.os,java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt"> <property name="gluegen-rt.jar" value="${gluegen.build}/gluegen-rt.jar" /> <property name="jogl.all.jar" value="${jogl.build}/jar/jogl.all.jar" /> + <property name="jogl.cg.jar" value="${jogl.build}/jar/atomic/jogl.cg.jar" /> <property name="joal.jar" value="${joal.build}/joal.jar" /> <property name="simple-xml.jar" value="${project.root}/lib/simple-xml-1.1.1.jar" /> <property name="classes" value="${build}/classes" /> @@ -145,6 +146,7 @@ <mkdir dir="${classes}" /> <path id="jogl-demos.classpath"> <pathelement location="${jogl.all.jar}" /> + <pathelement location="${jogl.cg.jar}" /> <pathelement location="${joal.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${simple-xml.jar}" /> @@ -199,6 +201,7 @@ <mkdir dir="${classes}" /> <path id="jogl-demos.classpath"> <pathelement location="${jogl.all.jar}" /> + <pathelement location="${jogl.cg.jar}" /> <pathelement location="${gluegen-rt.jar}" /> </path> <javac destdir="${classes}" includes="demos/GLInfo*,demos/es1/**,demos/es2/**" source="1.5" debug="true" debuglevel="source,lines" diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index 02f8ccc..716e32b 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -1,10 +1,10 @@ #! /bin/sh -. /devtools/etc/profile.ant +SDIR=`dirname $0` # -Dc.compiler.debug=true +# -Djogl.cg=1 \ ant -v \ - -Djogl.cg=1 \ -Drootrel.build=build-macosx \ $* 2>&1 | tee make.jogl.all.macosx.log diff --git a/make/scripts/make.jogl.all.x86.sh b/make/scripts/make.jogl.all.x86.sh index 41fa16b..004abbb 100755 --- a/make/scripts/make.jogl.all.x86.sh +++ b/make/scripts/make.jogl.all.x86.sh @@ -1,11 +1,17 @@ #! /bin/sh -. ../../setenv-build-jogl-x86.sh +SDIR=`dirname $0` + +if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh +fi + +. $SDIR/../../../jogl/etc/profile.jogl JOGL_ALL $SDIR/../../../jogl/build-x86 # -Dc.compiler.debug=true ant \ -Djogl.cg=1 \ - -Duser.swt.jar=$HOME/.java/swt-3.6-gtk-linux-x86.jar \ + -Duser.swt.jar=$SWT_CLASSPATH \ -Drootrel.build=build-x86 \ $* 2>&1 | tee make.jogl.all.x86.log diff --git a/make/scripts/make.jogl.all.x86_64.sh b/make/scripts/make.jogl.all.x86_64.sh index f5c6b64..110e51d 100755 --- a/make/scripts/make.jogl.all.x86_64.sh +++ b/make/scripts/make.jogl.all.x86_64.sh @@ -1,11 +1,19 @@ #! /bin/sh +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 +fi + +. $SDIR/../../../jogl/etc/profile.jogl JOGL_ALL $SDIR/../../../jogl/build-x86_64 + # -Dc.compiler.debug=true # -Djogl.cg=1 \ # -Djogl.redbook=true \ ant \ -Djogl.cg=1 \ - -Duser.swt.jar=$HOME/.java/swt.jar \ + -Duser.swt.jar=$SWT_CLASSPATH \ -Drootrel.build=build-x86_64 \ $* 2>&1 | tee make.jogl.all.x86_64.log diff --git a/make/scripts/make.jogl.cdcfp.macosx.sh b/make/scripts/make.jogl.cdcfp.macosx.sh deleted file mode 100755 index 8677f88..0000000 --- a/make/scripts/make.jogl.cdcfp.macosx.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -. /devtools/etc/profile.ant - -# -Dc.compiler.debug=true - -ant -v \ - -Djogl.es=1 \ - -Drootrel.build=build-cdcfp-macosx \ - $* 2>&1 | tee make.jogl.cdcfp.macosx.log diff --git a/make/scripts/make.jogl.cdcfp.x86.sh b/make/scripts/make.jogl.cdcfp.x86.sh deleted file mode 100755 index 60b7f4a..0000000 --- a/make/scripts/make.jogl.cdcfp.x86.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -. ../../setenv-build-jogl-x86.sh - -# -Dc.compiler.debug=true - -ant \ - -Djogl.es=1 \ - -Drootrel.build=build-cdcfp-x86 \ - $* 2>&1 | tee make.jogl.cdcfp.x86.log |