diff options
| author | Sven Gothel <[email protected]> | 2009-07-01 07:34:59 +0000 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2009-07-01 07:34:59 +0000 |
| commit | dbf66ad9e297d208029d6bb5e06f8b0f0c847d57 (patch) | |
| tree | 49597ff70e76440c337ce16ecce4f48cec66ffe8 /make | |
| parent | d075bda489c425d7f1ccd45944db6a8696bb0fd2 (diff) | |
Sync with jogl r2009 ; Unified setenv-jogl.sh, which works from the autobuild directory as well ; Unified java*.sh scripts
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@358 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 4 | ||||
| -rw-r--r-- | make/make.jogl.all.macosx.sh | 1 | ||||
| -rw-r--r-- | make/make.jogl.all.x86.sh | 1 | ||||
| -rw-r--r-- | make/make.jogl.all.x86_64.sh | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/make/build.xml b/make/build.xml index f5cd571..bc94d58 100644 --- a/make/build.xml +++ b/make/build.xml @@ -56,6 +56,9 @@ <target name="init" depends="java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes"> <property name="jogl.core.jar" value="../../jogl/${rootrel.build}/jogl/jogl.core.jar" /> + <condition property="jogl.cg.jar" value="../../jogl/${rootrel.build}/jogl/jogl.cg.jar"> + <isset property="jogl.cg"/> + </condition> <property name="jogl.gles12.jar" value="../../jogl/${rootrel.build}/jogl/jogl.gles12.jar" /> <property name="jogl.gles12.dbg.jar" value="../../jogl/${rootrel.build}/jogl/jogl.gles12.dbg.jar" /> <property name="jogl.gles1.jar" value="../../jogl/${rootrel.build}/jogl/jogl.gles1.jar" /> @@ -113,6 +116,7 @@ <pathelement location="${nativewindow.x11.jar}" /> <pathelement location="${nativewindow.awt.jar}" /> <pathelement location="${jogl.core.jar}" /> + <pathelement location="${jogl.cg.jar}" /> <pathelement location="${jogl.gles1.jar}" /> <pathelement location="${jogl.gles1.dbg.jar}" /> <pathelement location="${jogl.gles2.jar}" /> diff --git a/make/make.jogl.all.macosx.sh b/make/make.jogl.all.macosx.sh index e7a5ee3..02f8ccc 100644 --- a/make/make.jogl.all.macosx.sh +++ b/make/make.jogl.all.macosx.sh @@ -5,5 +5,6 @@ # -Dc.compiler.debug=true ant -v \ + -Djogl.cg=1 \ -Drootrel.build=build-macosx \ $* 2>&1 | tee make.jogl.all.macosx.log diff --git a/make/make.jogl.all.x86.sh b/make/make.jogl.all.x86.sh index 89745c9..cfd4709 100644 --- a/make/make.jogl.all.x86.sh +++ b/make/make.jogl.all.x86.sh @@ -5,5 +5,6 @@ # -Dc.compiler.debug=true ant \ + -Djogl.cg=1 \ -Drootrel.build=build-x86 \ $* 2>&1 | tee make.jogl.all.x86.log diff --git a/make/make.jogl.all.x86_64.sh b/make/make.jogl.all.x86_64.sh index 6d96b9c..1fa1675 100644 --- a/make/make.jogl.all.x86_64.sh +++ b/make/make.jogl.all.x86_64.sh @@ -3,7 +3,9 @@ . ../../setenv-build-jogl-x86_64.sh # -Dc.compiler.debug=true +# -Djogl.cg=1 \ ant \ + -Djogl.cg=1 \ -Drootrel.build=build-x86_64 \ $* 2>&1 | tee make.jogl.all.x86_64.log |