diff options
author | Sven Gothel <[email protected]> | 2013-08-28 02:44:29 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-08-28 02:44:29 +0200 |
commit | 15ec34db947f89b1d20043b729a09413a425de5d (patch) | |
tree | d5545d00009717cdabbb6e52963dbcdea7cc48b9 /make/build-common.xml | |
parent | 5031a42647442b71ef32041d332ed5f22d3e6ecf (diff) |
Fix libav/ffmpeg compilation: Use 'dot less' dir/file names; Compile ffmpeg version dependent c-files individually and inject object files. ; ffmpeg *register_all() at setStream0(..)
- Use 'dot less' dir/file names
- Compile ffmpeg version dependent c-files individually and inject object files.
- ffmpeg *register_all() at setStream0(..)
- Only register devices if available _and_ camera is requested.
Diffstat (limited to 'make/build-common.xml')
-rw-r--r-- | make/build-common.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 2061d55c9..e790ab42b 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -36,6 +36,7 @@ --> <target name="set.debug"> <property name="c.compiler.debug" value="true" /> + <property name="c.compiler.optimise" value="none" /> <property name="javacdebug" value="true" /> <property name="javacdebuglevel" value="source,lines,vars" /> </target> @@ -44,6 +45,9 @@ <target name="common.init" depends="jogamp.env.init, gluegen.cpptasks.detect.os" unless="common.init.done"> <property name="common.init.done" value="true" /> + <property name="c.compiler.debug" value="false" /> + <property name="c.compiler.optimise" value="none" /> + <!-- Set the project root directory to be up one directory. --> <property name="project.root" value=".." /> <property name="build" value="${project.root}/${rootrel.build}" /> @@ -216,6 +220,7 @@ <property name="jogl.build.xml" value="${jogl.make}/build-jogl.xml" /> <property name="build.jogl" value="${build}/jogl" /> <property name="obj.jogl" value="${build.jogl}/obj"/> + <property name="rootrel.obj.jogl" value="${rootrel.build}/jogl/obj"/> <property name="newt.make" value="." /> <property name="newt.build.xml" value="${newt.make}/build-newt.xml" /> |