diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 6 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 2 | ||||
| -rw-r--r-- | make/build-newt.xml | 6 | ||||
| -rwxr-xr-x | make/config/jogl/eglext.cfg | 2 | ||||
| -rwxr-xr-x | make/config/jogl/gl-es1.cfg | 4 | ||||
| -rwxr-xr-x | make/config/jogl/gl-es2.cfg | 4 | ||||
| -rw-r--r-- | make/config/jogl/gl-gl2.cfg | 6 | ||||
| -rw-r--r-- | make/config/jogl/gl-gl2es12.cfg | 6 | ||||
| -rwxr-xr-x | make/config/jogl/gl-if-gl2_es1.cfg | 2 | ||||
| -rwxr-xr-x | make/config/jogl/gl-if-gl2_es2.cfg | 2 | ||||
| -rwxr-xr-x | make/config/jogl/glxext.cfg | 2 |
11 files changed, 21 insertions, 21 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index bcb930b05..79fdb06e2 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -336,7 +336,7 @@ <isset property="rootrel.build"/> </not> </condition> - <property name="rootrel.build.jogl" value="${rootrel.build}-jogl" /> + <property name="rootrel.build.jogl" value="${rootrel.build}/jogl" /> <property name="rootrel.src.java" value="src/jogl/classes" /> <property name="rootrel.src.c" value="src/jogl/native" /> <property name="rootrel.src.c.openmax" value="src/jogl/native/openmax" /> @@ -355,13 +355,13 @@ <property name="gluegen.build.xml" value="${gluegen.make.dir}/build.xml" /> <property name="gluegen.jar" value="../../gluegen/${rootrel.build}/gluegen.jar" /> <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" /> - <property name="nativewindow.all.jar" value="../${rootrel.build}-nativewindow/nativewindow.all.jar" /> + <property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" /> <!-- The source directories. --> <property name="src.java" value="${project.root}/${rootrel.src.java}" /> <property name="src.c" value="${project.root}/${rootrel.src.c}" /> <property name="build" value="${project.root}/${rootrel.build.jogl}" /> - <property name="tempdir" value="${project.root}/build-temp" /> + <property name="tempdir" value="${build}/temp" /> <!-- The generated source directories. --> <property name="src.generated" value="${build}/gensrc" /> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 2fc8414fa..da09e286d 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -214,7 +214,7 @@ <isset property="rootrel.build"/> </not> </condition> - <property name="rootrel.build.nativewindow" value="${rootrel.build}-nativewindow" /> + <property name="rootrel.build.nativewindow" value="${rootrel.build}/nativewindow" /> <property name="rootrel.src" value="src/nativewindow" /> <property name="rootrel.src.java" value="${rootrel.src}/classes" /> <property name="rootrel.src.c" value="${rootrel.src}/native" /> diff --git a/make/build-newt.xml b/make/build-newt.xml index e8349b49d..a899e8bb1 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -177,15 +177,15 @@ <isset property="rootrel.build"/> </not> </condition> - <property name="rootrel.build.newt" value="${rootrel.build}-newt" /> + <property name="rootrel.build.newt" value="${rootrel.build}/newt" /> <property name="rootrel.src" value="src/newt" /> <property name="rootrel.src.java" value="${rootrel.src}/classes" /> <property name="rootrel.src.c" value="${rootrel.src}/native" /> <property name="rootrel.obj" value="${rootrel.build.newt}/obj" /> <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" /> - <property name="nativewindow.all.jar" value="../${rootrel.build}-nativewindow/nativewindow.all.jar" /> - <property name="jogl.all.jar" value="../${rootrel.build}-jogl/jogl.all.jar" /> + <property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" /> + <property name="jogl.all.jar" value="../${rootrel.build}/jogl/jogl.all.jar" /> <!-- The source directories. --> <property name="src.java" value="${project.root}/${rootrel.src.java}" /> diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg index bdd9a3655..e0280c056 100755 --- a/make/config/jogl/eglext.cfg +++ b/make/config/jogl/eglext.cfg @@ -10,7 +10,7 @@ ImplPackage com.sun.opengl.impl.egl ImplJavaClass EGLExtImpl # Shouldn't matter which one of these we pick up -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/com/sun/opengl/impl/egl/EGL.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/com/sun/opengl/impl/egl/EGL.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 2b630ee70..a90c47874 100755 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -2,8 +2,8 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/es1 -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES1.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg index 669eabcf3..b9f2f2de4 100755 --- a/make/config/jogl/gl-es2.cfg +++ b/make/config/jogl/gl-es2.cfg @@ -2,8 +2,8 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/es2 -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES2.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java Package javax.media.opengl diff --git a/make/config/jogl/gl-gl2.cfg b/make/config/jogl/gl-gl2.cfg index 76cb0573a..5d3df7574 100644 --- a/make/config/jogl/gl-gl2.cfg +++ b/make/config/jogl/gl-gl2.cfg @@ -2,9 +2,9 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl2 -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES1.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES2.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg index 2d0704577..98c2fd3f1 100644 --- a/make/config/jogl/gl-gl2es12.cfg +++ b/make/config/jogl/gl-gl2es12.cfg @@ -2,9 +2,9 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl2es12 -ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java -ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java +ExtendedInterfaceSymbolsOnly ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java +ExtendedInterfaceSymbolsOnly ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES1.java +ExtendedInterfaceSymbolsOnly ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES2.java ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/GLObject.java ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java diff --git a/make/config/jogl/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg index 72e0dbcd3..654659343 100755 --- a/make/config/jogl/gl-if-gl2_es1.cfg +++ b/make/config/jogl/gl-if-gl2_es1.cfg @@ -8,7 +8,7 @@ Extends GL2ES1 GLMatrixIf Extends GL2ES1 GLPointerIf Extends GL2ES1 GLLightingIf -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg index 7e219a3fb..493dc2242 100755 --- a/make/config/jogl/gl-if-gl2_es2.cfg +++ b/make/config/jogl/gl-if-gl2_es2.cfg @@ -5,7 +5,7 @@ JavaClass GL2ES2 Extends GL2ES2 GLObject Extends GL2ES2 GL -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg index d69a3df3b..564dfc6a7 100755 --- a/make/config/jogl/glxext.cfg +++ b/make/config/jogl/glxext.cfg @@ -9,7 +9,7 @@ JavaClass GLXExt ImplPackage com.sun.opengl.impl.x11.glx ImplJavaClass GLXExtImpl -ExtendedInterfaceSymbols ../build-temp/gensrc/classes/com/sun/opengl/impl/x11/glx/GLX.java +ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/com/sun/opengl/impl/x11/glx/GLX.java Include gl-common-gl2.cfg Include gl-desktop.cfg |