diff options
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 79e16933c..720607077 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1111,10 +1111,9 @@ debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="nativewindow_gluegen.classpath"/> <include name="jogamp/opengl/util/av/impl/FFMPEGStaticNatives.java" /> - <include name="jogamp/opengl/util/av/impl/FFMPEGv08Natives.java" /> - <include name="jogamp/opengl/util/av/impl/FFMPEGv09Natives.java" /> - <include name="jogamp/opengl/util/av/impl/FFMPEGv10Natives.java" /> - <include name="jogamp/opengl/util/av/impl/FFMPEGv11Natives.java" /> + <include name="jogamp/opengl/util/av/impl/FFMPEGv0400Natives.java" /> + <include name="jogamp/opengl/util/av/impl/FFMPEGv0500Natives.java" /> + <include name="jogamp/opengl/util/av/impl/FFMPEGv0600Natives.java" /> <compilerarg value="-implicit:none" /> </javac> @@ -1579,7 +1578,7 @@ <sysincludepath path="${stub.includes.gluegen.cc}"/> <includepath path="stub_includes/khr"/> <includepath path="stub_includes/opengl"/> - <includepath path="stub_includes/libav/@{version.lav}"/> + <includepath path="stub_includes/ffmpeg/@{version.lav}"/> <!-- This is for the generated headers for handwritten C code --> <includepath path="${src.c}"/> @@ -1615,10 +1614,9 @@ <patternset id="c.obj.files.none"> </patternset> <patternset id="c.obj.files.ffmpeg.inject"> - <include name="${rootrel.obj.joglsub}/ffmpeg_lavc53_lavf53_lavu51.*"/> - <include name="${rootrel.obj.joglsub}/ffmpeg_lavc54_lavf54_lavu52_lavr01.*"/> - <include name="${rootrel.obj.joglsub}/ffmpeg_lavc55_lavf55_lavu53_lavr01.*"/> - <include name="${rootrel.obj.joglsub}/ffmpeg_lavc56_lavf56_lavu54_lavr02.*"/> + <include name="${rootrel.obj.joglsub}/ffmpeg_v0400.*"/> <!-- ffmpeg 4.x.y --> + <include name="${rootrel.obj.joglsub}/ffmpeg_v0500.*"/> <!-- ffmpeg 5.x.y --> + <include name="${rootrel.obj.joglsub}/ffmpeg_v0600.*"/> <!-- ffmpeg 6.x.y --> </patternset> <patternset id="c.src.files.jogl.desktop"> @@ -1685,7 +1683,7 @@ <outofdate> <sourcefiles> <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset> - <fileset dir="${obj.joglsub}" includes="*jogl_ffmpegv08*, *jogl_ffmpegv09*, *jogl_ffmpegv10*"/> <!-- requires linkage --> + <fileset dir="${obj.joglsub}" includes="*jogl_ffmpegv0400*, *jogl_ffmpegv0500*, *jogl_ffmpegv0600*"/> <!-- requires linkage --> </sourcefiles> <targetfiles> <fileset dir="${obj.jogl}" includes="${native.library.prefix}@{output.lib.name}.${native.library.suffix}"/> @@ -1755,23 +1753,18 @@ </macrodef> <target name="c.build.jogl.ffmpeg" if="setup.addNativeFFmpeg"> - <c.build.ffmpeg version.lav="lavc53_lavf53_lavu51" - output.lib.name="jogl_ffmpegv08" + <c.build.ffmpeg version.lav="v0400" + output.lib.name="jogl_ffmpegv0400" compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="${linker.cfg.id.os}"/> - <c.build.ffmpeg version.lav="lavc54_lavf54_lavu52_lavr01" - output.lib.name="jogl_ffmpegv09" + <c.build.ffmpeg version.lav="v0500" + output.lib.name="jogl_ffmpegv0500" compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="${linker.cfg.id.os}"/> - <c.build.ffmpeg version.lav="lavc55_lavf55_lavu53_lavr01" - output.lib.name="jogl_ffmpegv10" - compiler.cfg.id="${compiler.cfg.id}" - linker.cfg.id="${linker.cfg.id.os}"/> - - <c.build.ffmpeg version.lav="lavc56_lavf56_lavu54_lavr02" - output.lib.name="jogl_ffmpegv11" + <c.build.ffmpeg version.lav="v0600" + output.lib.name="jogl_ffmpegv0600" compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="${linker.cfg.id.os}"/> </target> |