diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 11 | ||||
| -rw-r--r-- | make/build-jogl.xml | 14 |
2 files changed, 18 insertions, 7 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 567219434..b6bf47fc5 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -2,7 +2,9 @@ <!-- - Some environment defs affecting native compilation - setup.addNativeDRMGBM ( always true if 'isLinux' ) + setup.addNativeDRMGBM ( true if 'isLinux' ) + + setup.addNativeFFmpeg ( true if not 'isAndroid' ) --> <project name="JOGLCommonStuff" basedir="." default="common.init"> @@ -120,10 +122,17 @@ <isset property="isLinux"/> </condition> + <condition property="setup.addNativeFFmpeg"> + <not> + <istrue value="${isAndroid}" /> + </not> + </condition> + <echo message="setup.noAWT: ${setup.noAWT}" /> <echo message="setup.noNativeAWT: ${setup.noNativeAWT}" /> <echo message="setup.noNativeDesktop: ${setup.noNativeDesktop}" /> <echo message="setup.addNativeDRMGBM: ${setup.addNativeDRMGBM}" /> + <echo message="setup.addNativeFFmpeg: ${setup.addNativeFFmpeg}" /> <!-- Load the user specified properties file that defines various host - specific paths. The user will be notified if this is does not diff --git a/make/build-jogl.xml b/make/build-jogl.xml index ac5c08dfd..84b422368 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -45,6 +45,8 @@ - Some environment defs affecting native compilation (only) setup.noNativeDesktop - drop native desktop bindings (glx, wgl, ..) + setup.addNativeFFmpeg - add binding to FFmpeg + setup.addNativeOpenMAX - add experimental binding to Khrono's OpenMAX setup.addNativeNVidiaCG - add experimental binding to NVidia's Cg language @@ -1760,11 +1762,7 @@ </sequential> </macrodef> - <target name="c.build.jogl.prepare"> - <!-- Generate the waveout Mixer header --> - <!-- FIXME: this is temporary until we move this to another workspace --> - <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="com.jogamp.audio.windows.waveout.Mixer" /--> - + <target name="c.build.jogl.ffmpeg" if="setup.addNativeFFmpeg"> <c.build.ffmpeg version.lav="lavc53_lavf53_lavu51" output.lib.name="jogl_ffmpegv08" compiler.cfg.id="${compiler.cfg.id}" @@ -1787,6 +1785,10 @@ </target> <target name="c.build.jogl.desktop" unless="setup.noNativeDesktop"> + <!-- Generate the waveout Mixer header --> + <!-- FIXME: this is temporary until we move this to another workspace --> + <!--javah destdir="${build.jogl}/gensrc/native/jogl" classpath="${javah.classpath}" class="com.jogamp.audio.windows.waveout.Mixer" /--> + <c.build c.compiler.src.files="c.src.files.jogl.desktop" c.compiler.obj.files="c.obj.files.ffmpeg.inject" output.lib.name="jogl_desktop" @@ -1823,7 +1825,7 @@ <antcall target="c.manifest.cg" inheritRefs="true" /> </target> - <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.desktop,c.build.jogl.mobile,c.build.jogl.cg"> + <target name="c.build.jogl" depends="c.configure,c.build.jogl.ffmpeg,c.build.jogl.desktop,c.build.jogl.mobile,c.build.jogl.cg"> <antcall target="c.manifest" inheritRefs="true" /> </target> |