diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/i386/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/libpostproc/Makefile.am | 4 | ||||
| -rw-r--r-- | src/post/goom/Makefile.am | 3 | ||||
| -rw-r--r-- | src/post/planar/Makefile.am | 5 |
5 files changed, 22 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a8bc9b8a6..4ecb5bce7 100644 --- a/configure.ac +++ b/configure.ac @@ -2582,9 +2582,15 @@ esac AC_SUBST([NOUNDEF]) dnl Common cflags for all platforms -CFLAGS="-DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE \$(MULTIPASS_CFLAGS) $warnflags $CFLAGS" +CFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE \$(MULTIPASS_CFLAGS) $warnflags $CFLAGS" DEBUG_CFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE $DEBUG_CFLAGS" +if test "x$enable_debug" = "xyes"; then + CFLAGS="$CFLAGS -DDEBUG" +else + CFLAGS="$CFLAGS -DNDEBUG" +fi + dnl --------------------------------------------- dnl Output configuration files dnl --------------------------------------------- diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am index e3285d9cd..b9d33c3a7 100644 --- a/src/libffmpeg/libavcodec/i386/Makefile.am +++ b/src/libffmpeg/libavcodec/i386/Makefile.am @@ -14,6 +14,9 @@ dsputil_mmx.o dsputil_mmx.lo: CFLAGS=$(shell echo @CFLAGS@ | sed -e 's/-funroll- # Avoid errors on (at least) amd64 with -O0 fdct_mmx.o fdct_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/^/-Os /; s/-O0\?\s/-Os /g'` +# Avoid errors with -O0 +mpegvideo_mmx.o mpegvideo_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'` + ASFLAGS = noinst_LTLIBRARIES = libavcodec_mmx.la diff --git a/src/libffmpeg/libavcodec/libpostproc/Makefile.am b/src/libffmpeg/libavcodec/libpostproc/Makefile.am index af1976b48..66bd17e53 100644 --- a/src/libffmpeg/libavcodec/libpostproc/Makefile.am +++ b/src/libffmpeg/libavcodec/libpostproc/Makefile.am @@ -4,6 +4,10 @@ include $(top_srcdir)/misc/Makefile.common # work, but at least it compiles. AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavcodec + +# Avoid errors with -O0 +postprocess.o postprocess.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'` + ASFLAGS = noinst_LTLIBRARIES = libpostprocess.la diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am index e6bae3374..53a806a7a 100644 --- a/src/post/goom/Makefile.am +++ b/src/post/goom/Makefile.am @@ -8,6 +8,9 @@ EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_releas #CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-Os/-O2/g'` CFLAGS = `echo @CFLAGS@ | sed -e 's/-Os/-O2/g'` +# Avoid errors with -O0 +xineplug_post_goom_la-xmmx.o xineplug_post_goom_la-xmmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'` + xinepost_LTLIBRARIES = xineplug_post_goom.la ## doesn't work diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 5fc425cdf..826f378a6 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -15,6 +15,11 @@ endif # work, but at least it compiles. AM_CFLAGS = $(ff_cflags) -fomit-frame-pointer +# Avoid errors with -O0 +xineplug_post_planar_la-eq.o xineplug_post_planar_la-eq.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'` +xineplug_post_planar_la-eq2.o xineplug_post_planar_la-eq2.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'` +xineplug_post_planar_la-noise.o xineplug_post_planar_la-noise.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'` + xinepost_LTLIBRARIES = xineplug_post_planar.la xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \ |