diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 7 | ||||
| -rw-r--r-- | make/build-oculusvr.xml | 5 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index b0162d9aa..64e1c4508 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -153,7 +153,7 @@ value="com/jogamp/opengl/**/swt/**"/> <property name="java.part.util" - value="com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/stereo/* com/jogamp/opengl/util/packrect/** com/jogamp/opengl/util/PNG* jogamp/opengl/util/av/** jogamp/opengl/util/jpeg/** jogamp/opengl/util/pngj/**"/> + value="com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/packrect/** com/jogamp/opengl/util/PNG* com/jogamp/opengl/util/stereo/** jogamp/opengl/util/av/** jogamp/opengl/util/jpeg/** jogamp/opengl/util/pngj/** jogamp/opengl/util/stereo/**"/> <property name="java.part.util.awt" value="com/jogamp/opengl/util/**/awt/**"/> @@ -173,6 +173,9 @@ <property name="java.part.core.shadercode" value="jogamp/opengl/shader/* jogamp/opengl/shader/bin/**"/> + <property name="java.part.util.shadercode" + value="jogamp/opengl/util/stereo/shader/*"/> + <property name="java.part.util.graph.shadercode" value="jogamp/graph/curve/opengl/shader/* jogamp/graph/curve/opengl/shader/bin/**"/> @@ -183,7 +186,7 @@ value="jogamp/opengl/util/glsl/fixedfunc/shaders/* jogamp/opengl/util/glsl/fixedfunc/shaders/bin/**"/> <property name="java.part.nonjava" - value="${java.part.core.shadercode} ${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> + value="${java.part.core.shadercode} ${java.part.util.shadercode} ${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> <property name="java.part.all-desktop" value="${java.part.sdk} ${java.part.glx} ${java.part.wgl} ${java.part.cgl} ${java.part.gldesktop} ${java.part.glu.gldesktop} ${java.part.util.gldesktop}"/> diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml index 15ed6bde4..22b442328 100644 --- a/make/build-oculusvr.xml +++ b/make/build-oculusvr.xml @@ -50,6 +50,7 @@ <!-- The source directories. --> <property name="src.java" value="${project.root}/${rootrel.src.java}" /> + <property name="src.ovr.java" value="${rel.oculusvr.sdk}/jogl/src/classes" /> <property name="src.c" value="${project.root}/${rootrel.src.c}" /> <!-- The generated source directories. --> @@ -195,6 +196,7 @@ debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="jogl_nativewindow_gluegen.classpath"/> <src path="${src.java}" /> + <src path="${src.ovr.java}" /> <src path="${src.generated.java}" /> </javac> <!-- make shadercode and fonts available in classpath --> @@ -618,6 +620,7 @@ <target name="build-jars-dependset" depends="init,gluegen.cpptasks.detect.os" > <dependset> <srcfileset dir="${src.java}"/> + <srcfileset dir="${src.ovr.java}"/> <targetfileset dir="." includes="${build.oculusvr}/oculusvr.jar" /> </dependset> </target> @@ -661,7 +664,7 @@ --> <target name="javadoc" depends="init"> <javadoc packagenames="${javadoc.packagenames}" - sourcepath="${src.java};${src.generated.java}" + sourcepath="${src.java};${src.ovr.java};${src.generated.java}" destdir="${javadoc}" windowtitle="${javadoc.windowtitle}" overview="${javadoc.overview}" encoding="UTF-8" diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 438c736d6..86d09e480 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -276,6 +276,7 @@ function jrun() { #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLSLCode" #D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer.Native" + #D_ARGS="-Djogl.debug.StereoDevice -Djogl.debug.StereoDevice.DumpData" #D_ARGS="-Djogl.debug.StereoDevice" if [ $awton -eq 1 ] ; then |