diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/make/build.xml b/make/build.xml index fad21ae72..98838837f 100644 --- a/make/build.xml +++ b/make/build.xml @@ -161,6 +161,9 @@ <property name="java.part.glsl" value="javax/media/opengl/glsl/**, com/sun/opengl/impl/glsl/**"/> + <property name="java.part.openmax" + value="com/sun/javafx/media/video/openmax/**"/> + <property name="java.part.sdk" value="javax/media/opengl/sdk/**"/> @@ -198,7 +201,7 @@ value="javax/media/opengl/TraceGLES1.*, javax/media/opengl/DebugGLES1.*"/> <property name="java.part.es2" - value="javax/media/opengl/**/es2/**, com/sun/opengl/**/es2/**, ${java.part.glsl}"/> + value="javax/media/opengl/**/es2/**, com/sun/opengl/**/es2/**, ${java.part.glsl}, ${java.part.openmax}"/> <property name="java.part.es2.dbg" value="javax/media/opengl/TraceGLES2.*, javax/media/opengl/DebugGLES2.*"/> @@ -370,6 +373,7 @@ <property name="src.generated.java.cg" value="${src.generated}/classes/com/sun/opengl/cg" /> <property name="src.generated.c" value="${src.generated}/native/jogl" /> <property name="src.generated.c.newt" value="${src.generated}/native/newt" /> + <property name="src.generated.c.openmax" value="${src.generated}/native/openmax" /> <property name="src.generated.c.cg" value="${src.generated}/native/jogl_cg" /> <!-- The compiler output directories. --> @@ -523,6 +527,7 @@ <mkdir dir="${src.generated.c.newt}/Windows" /> <mkdir dir="${src.generated.c.newt}/X11" /> <mkdir dir="${src.generated.c.newt}/KD" /> + <mkdir dir="${src.generated.c.openmax}" /> <mkdir dir="${classes}" /> <mkdir dir="${obj}" /> <mkdir dir="${obj.jogl}" /> @@ -1361,6 +1366,8 @@ <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/> <!-- FIXME: the Mixer should be moved to another library --> <!--include name="${rootrel.src.c.jogl}/Mixer.cpp" if="isWindows"/--> + <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> + <include name="${rootrel.src.c.openmax}/com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c" if="useOpenMAX"/> </patternset> <patternset id="c.src.files.jogl.gl2es12"> @@ -1380,6 +1387,8 @@ <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/> <!-- FIXME: the Mixer should be moved to another library --> <!--include name="${rootrel.src.c.jogl}/Mixer.cpp" if="isWindows"/--> + <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> + <include name="${rootrel.src.c.openmax}/com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c" if="useOpenMAX"/> </patternset> <patternset id="c.src.files.jogl.es2"> @@ -1392,6 +1401,8 @@ <include name="${rootrel.generated.c.jogl}/egl/EGLExtImpl_JNI.c"/> <include name="${rootrel.generated.c.jogl}/es2/GLES2Impl_JNI.c"/> <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/> + <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> + <include name="${rootrel.src.c.openmax}/com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c" if="useOpenMAX"/> </patternset> <patternset id="c.src.files.jogl.es1"> @@ -1406,6 +1417,8 @@ <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/> <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY --> <!--include name="${rootrel.generated.c.jogl}/es1/GLUes1_JNI.c" EMPTY /--> + <include name="${rootrel.src.c.openmax}/omx_tool.c" if="useOpenMAX"/> + <include name="${rootrel.src.c.openmax}/com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c" if="useOpenMAX"/> </patternset> <patternset id="c.src.files.cg"> @@ -1450,6 +1463,7 @@ <includepath path="${src.generated.c.newt}/MacOSX" if="isOSX"/> <includepath path="${src.generated.c.newt}/Windows" if="isWindows"/> <includepath path="${src.generated.c.newt}/KD" if="useKD"/> + <includepath path="${src.generated.c.openmax}" if="useOpenMAX"/> <!-- This must come last to not override real include paths --> <!-- includepath path="stub_includes/macosx" if="isOSX" / --> @@ -1506,6 +1520,7 @@ <!-- Generate the waveout Mixer header --> <!-- FIXME: this is temporary until we move this to another workspace --> <javah destdir="../build/gensrc/native/jogl" classpath="${jogl.all.jar}" class="com.sun.javafx.audio.windows.waveout.Mixer" /> + <javah destdir="../build/gensrc/native/openmax" classpath="${jogl.all.jar}" class="com.sun.javafx.media.video.openmax.OMXMoviePlayerImpl" /> </target> <target name="c.build.jogl.awt"> @@ -1621,7 +1636,7 @@ <jar manifest="tempversion" destfile="${jogl.core.jar}"> <fileset dir="${classes}" includes="javax/media/opengl/**, com/sun/gluegen/runtime/**, com/sun/opengl/**" - excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.sdk}, ${java.part.glsl}, ${java.part.glsl.fixed}, ${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glutess}, ${java.part.glumipmap}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.newt}, ${java.part.newt.awt}"/> + excludes="${java.excludes.fixme} ${java.part.egl}, ${java.part.sdk}, ${java.part.glsl}, ${java.part.openmax}, ${java.part.glsl.fixed}, ${java.part.gl2es12.x11}, ${java.part.gl2es12.win}, ${java.part.gl2es12.osx}, ${java.part.gl2es12.dbg}, ${java.part.gl2.x11}, ${java.part.gl2.win}, ${java.part.gl2.osx}, ${java.part.gl2.dbg}, ${java.part.es1}, ${java.part.es1.dbg}, ${java.part.es2}, ${java.part.es2.dbg}, ${java.part.awt}, ${java.part.glutess}, ${java.part.glumipmap}, ${java.part.glugl2}, ${java.part.util} ${java.part.util.awt} ${java.part.util.gl2}, ${java.part.newt}, ${java.part.newt.awt}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gles1.jar}"> <fileset dir="${classes}" @@ -1634,7 +1649,7 @@ </jar> <jar manifest="tempversion" destfile="${jogl.gles2.jar}"> <fileset dir="${classes}" - includes="${java.part.es2}, ${java.part.glsl}" + includes="${java.part.es2}, ${java.part.glsl}, ${java.part.openmax}" excludes="${java.part.es2.dbg}, ${java.part.glsl.fixed}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gles2.dbg.jar}"> @@ -1648,17 +1663,17 @@ </jar> <jar manifest="tempversion" destfile="${jogl.gl2es12.x11.jar}"> <fileset dir="${classes}" - includes="${java.part.gl2es12.x11}, ${java.part.glsl}" + includes="${java.part.gl2es12.x11}, ${java.part.glsl}, ${java.part.openmax}" excludes="${java.part.gl2es12.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gl2es12.win.jar}"> <fileset dir="${classes}" - includes="${java.part.gl2es12.win}, ${java.part.glsl}" + includes="${java.part.gl2es12.win}, ${java.part.glsl}, ${java.part.openmax}" excludes="${java.part.gl2es12.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gl2es12.osx.jar}"> <fileset dir="${classes}" - includes="${java.part.gl2es12.osx}, ${java.part.glsl}" + includes="${java.part.gl2es12.osx}, ${java.part.glsl}, ${java.part.openmax}" excludes="${java.part.gl2es12.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gl2es12.dbg.jar}"> @@ -1667,17 +1682,17 @@ </jar> <jar manifest="tempversion" destfile="${jogl.gl2.x11.jar}"> <fileset dir="${classes}" - includes="${java.part.gl2.x11}, ${java.part.glsl}" + includes="${java.part.gl2.x11}, ${java.part.glsl}, ${java.part.openmax}" excludes="${java.part.gl2.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gl2.win.jar}"> <fileset dir="${classes}" - includes="${java.part.gl2.win}, ${java.part.glsl}" + includes="${java.part.gl2.win}, ${java.part.glsl}, ${java.part.openmax}" excludes="${java.part.gl2.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gl2.osx.jar}"> <fileset dir="${classes}" - includes="${java.part.gl2.osx}, ${java.part.glsl}" + includes="${java.part.gl2.osx}, ${java.part.glsl}, ${java.part.openmax}" excludes="${java.part.gl2.dbg}, ${java.part.glugl2}, ${java.part.glsl.fixed}"/> </jar> <jar manifest="tempversion" destfile="${jogl.gl2.dbg.jar}"> @@ -1721,7 +1736,7 @@ <jar manifest="tempversion" destfile="${jogl.util.jar}"> <fileset dir="${classes}" includes="${java.part.util}" - excludes="com/sun/opengl/**/awt/**, com/sun/opengl/**/gl2/**, ${java.part.glsl}"/> + excludes="com/sun/opengl/**/awt/**, com/sun/opengl/**/gl2/**, ${java.part.glsl}, ${java.part.openmax}"/> </jar> <jar manifest="tempversion" destfile="${jogl.util.gl2.jar}"> <fileset dir="${classes}" |