diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-04 20:59:09 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-04 20:59:09 +0100 |
| commit | 33e68bd91eb35951cfb9b5748c028f3936331cff (patch) | |
| tree | 64e082ac978853a0fe55ce6a3da96b49714f76f2 /contrib | |
| parent | 53c578ab41a18686c99b7168dc6e7de4479fb74f (diff) | |
| parent | 6d72cf30f29689035eddbe95d35fd39fcf5d70ca (diff) | |
| download | xine-lib-33e68bd91eb35951cfb9b5748c028f3936331cff.tar.gz xine-lib-33e68bd91eb35951cfb9b5748c028f3936331cff.tar.bz2 | |
Merge Matthias Kretz's changes.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 2258d2fd2..a61af87e0 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -70,16 +70,19 @@ configure_options =\ --disable-shared --enable-static --disable-demuxers --disable-muxers --disable-strip \ --enable-gpl --enable-pthreads --disable-ffmpeg --disable-ffserver --disable-ffplay -if DEBUG_BUILD -configure_options += --enable-debug -else +# --enable-debug --disable-opts breaks the build of ffmpeg on x86: +# i386/mpegvideo_mmx_template.c:108: error: can't find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ +# pending a real fix --enable-debug for libxine does not enable debugging options for ffmpeg for now +#if DEBUG_BUILD +#configure_options += --enable-debug +#else configure_options += --disable-debug -endif +#endif if PROFILING_BUILD configure_options += --enable-gprof endif if DISABLE_OPTIMIZATIONS -configure_options += --disable-opts +#configure_options += --disable-opts endif if HAVE_MLIB configure_options += --enable-sunmlib |