From 15ec34db947f89b1d20043b729a09413a425de5d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 28 Aug 2013 02:44:29 +0200
Subject: 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.
---
 make/build-common.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'make/build-common.xml')

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" />
-- 
cgit v1.2.3