From 0ace3bb2f2e67afd98d1e676199ce99256e12a1c Mon Sep 17 00:00:00 2001 From: Eric Petit Date: Sun, 18 Aug 2002 11:32:06 +0000 Subject: [PATCH] Fixed a few linking BeOS problems (-lm, -lstdc++.r4...). Now everything should compile with every gcc with no problem (mp4, ffmpeg and faad plugins, especially). --- configure | 19 +++++++++++++------ configure.in | 23 +++++++++++++++++------ modules/gui/beos/VlcWrapper.cpp | 4 ++-- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 33897249f9..3b141d34e6 100755 --- a/configure +++ b/configure @@ -3429,7 +3429,7 @@ fi save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"; CFLAGS="${save_CFLAGS}" vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" - beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker" + beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker -lstdc++.r4" ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" ;; x*) @@ -4487,6 +4487,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm" i420_rgb_LDFLAGS="${i420_rgb_LDFLAGS} -lm" + faad_LDFLAGS="${faad_LDFLAGS} -lm" else echo "$ac_t""no" 1>&6 @@ -5665,7 +5666,7 @@ esac BUILTINS="${BUILTINS}" PLUGINS="${PLUGINS} misc/dummy/dummy misc/null/null" -PLUGINS="${PLUGINS} control/rc/rc misc/logger/logger access/file access/udp access/http access/rtp misc/network/ipv4 misc/memcpy/memcpy" +PLUGINS="${PLUGINS} control/rc/rc misc/logger/logger access/file misc/memcpy/memcpy" PLUGINS="${PLUGINS} demux/mpeg/es demux/mpeg/audio demux/mpeg/mpeg_system demux/mpeg/ps demux/mpeg/ts" PLUGINS="${PLUGINS} codec/mpeg_video/idct/idct codec/mpeg_video/idct/idctclassic codec/mpeg_video/motion/motion codec/mpeg_video/mpeg_video codec/spudec/spudec codec/spdif codec/mpeg_audio/mpeg_audio" #PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/a52old/a52old codec/lpcm/lpcm" @@ -5677,12 +5678,18 @@ PLUGINS="${PLUGINS} audio_output/file" #PLUGINS="${PLUGINS} visualization/scope/scope" PLUGINS="${PLUGINS} video_chroma/i420_rgb video_chroma/i420_yuy2 video_chroma/i422_yuy2 video_chroma/i420_ymga" +NETWORK_MODULES="access/udp access/http access/rtp misc/network/ipv4" MMX_MODULES="misc/memcpy/memcpymmx codec/mpeg_video/idct/idctmmx codec/mpeg_video/motion/motionmmx video_chroma/i420_rgb_mmx video_chroma/i420_yuy2_mmx video_chroma/i422_yuy2_mmx video_chroma/i420_ymga_mmx" MMXEXT_MODULES="misc/memcpy/memcpymmxext codec/mpeg_video/idct/idctmmxext codec/mpeg_video/motion/motionmmxext" THREEDNOW_MODULES="misc/memcpy/memcpy3dn codec/a52old/imdct/imdct3dn codec/a52old/downmix/downmix3dn" SSE_MODULES="codec/a52old/imdct/imdctsse codec/a52old/downmix/downmixsse" ALTIVEC_MODULES="codec/mpeg_video/idct/idctaltivec codec/mpeg_video/motion/motionaltivec misc/memcpy/memcpyaltivec" +if test x$SYS != xbeos +then + PLUGINS="${PLUGINS} ${NETWORK_MODULES}" +fi + echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6 echo "configure:5688: checking if \$CC groks MMX inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then @@ -7019,7 +7026,7 @@ echo "configure:7012: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 then echo "$ac_t""${real_ffmpeg_tree}/libavcodec/libavcodec.a" 1>&6 BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a -lm" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a" ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec" else echo "$ac_t""no" 1>&6 @@ -7027,7 +7034,7 @@ echo "configure:7012: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 fi else CFLAGS="${save_CFLAGS} ${ffmpeg_CFLAGS}" - LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS} -lm" + LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS}" echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6 echo "configure:7033: checking for avcodec_init in -lavcodec" >&5 ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'` @@ -7065,7 +7072,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" else echo "$ac_t""no" 1>&6 { echo "configure: error: Cannot find libavcodec library..." 1>&2; exit 1; } @@ -7095,7 +7102,7 @@ fi faad_CFLAGS="${faad_CFLAGS} -I${with_faad}/include" faad_LDFLAGS="${faad_LDFLAGS} -L${with_faad}/lib" fi - faad_LDFLAGS="${faad_LDFLAGS} -lm" + faad_LDFLAGS="${faad_LDFLAGS}" # Check whether --with-faad-tree or --without-faad-tree was given. if test "${with_faad_tree+set}" = set; then diff --git a/configure.in b/configure.in index 74b52b852a..bee56967ed 100644 --- a/configure.in +++ b/configure.in @@ -114,7 +114,7 @@ case "x${target_os}" in save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"; CFLAGS="${save_CFLAGS}" vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" - beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker" + beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker -lstdc++.r4" ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" ;; x*) @@ -196,6 +196,7 @@ AC_CHECK_LIB(m,pow, imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm" i420_rgb_LDFLAGS="${i420_rgb_LDFLAGS} -lm" + faad_LDFLAGS="${faad_LDFLAGS} -lm" ) dnl Check for pthreads - borrowed from XMMS @@ -439,7 +440,7 @@ dnl default modules dnl BUILTINS="${BUILTINS}" PLUGINS="${PLUGINS} misc/dummy/dummy misc/null/null" -PLUGINS="${PLUGINS} control/rc/rc misc/logger/logger access/file access/udp access/http access/rtp misc/network/ipv4 misc/memcpy/memcpy" +PLUGINS="${PLUGINS} control/rc/rc misc/logger/logger access/file misc/memcpy/memcpy" PLUGINS="${PLUGINS} demux/mpeg/es demux/mpeg/audio demux/mpeg/mpeg_system demux/mpeg/ps demux/mpeg/ts" PLUGINS="${PLUGINS} codec/mpeg_video/idct/idct codec/mpeg_video/idct/idctclassic codec/mpeg_video/motion/motion codec/mpeg_video/mpeg_video codec/spudec/spudec codec/spdif codec/mpeg_audio/mpeg_audio" #PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/a52old/a52old codec/lpcm/lpcm" @@ -451,6 +452,11 @@ PLUGINS="${PLUGINS} audio_output/file" #PLUGINS="${PLUGINS} visualization/scope/scope" PLUGINS="${PLUGINS} video_chroma/i420_rgb video_chroma/i420_yuy2 video_chroma/i422_yuy2 video_chroma/i420_ymga" +dnl +dnl Network modules +dnl +NETWORK_MODULES="access/udp access/http access/rtp misc/network/ipv4" + dnl dnl Accelerated modules dnl @@ -460,6 +466,11 @@ THREEDNOW_MODULES="misc/memcpy/memcpy3dn codec/a52old/imdct/imdct3dn codec/a52ol SSE_MODULES="codec/a52old/imdct/imdctsse codec/a52old/downmix/downmixsse" ALTIVEC_MODULES="codec/mpeg_video/idct/idctaltivec codec/mpeg_video/motion/motionaltivec misc/memcpy/memcpyaltivec" +if test x$SYS != xbeos +then + PLUGINS="${PLUGINS} ${NETWORK}" +fi + AC_CACHE_CHECK([if \$CC groks MMX inline assembly], [ac_cv_mmx_inline], [CFLAGS="${save_CFLAGS}" @@ -1048,7 +1059,7 @@ then dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a -lm" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a" ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec" else dnl The given libavcodec wasn't built @@ -1057,10 +1068,10 @@ then fi else CFLAGS="${save_CFLAGS} ${ffmpeg_CFLAGS}" - LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS} -lm" + LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS}" AC_CHECK_LIB(avcodec, avcodec_init, [ BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" ], + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" ], [ AC_MSG_ERROR([Cannot find libavcodec library...]) ]) LDFLAGS="${save_LDFLAGS}" CFLAGS="${save_CFLAGS}" @@ -1081,7 +1092,7 @@ then faad_CFLAGS="${faad_CFLAGS} -I${with_faad}/include" faad_LDFLAGS="${faad_LDFLAGS} -L${with_faad}/lib" fi - faad_LDFLAGS="${faad_LDFLAGS} -lm" + faad_LDFLAGS="${faad_LDFLAGS}" AC_ARG_WITH(faad-tree, [ --with-faad-tree=PATH faad tree for static linking]) diff --git a/modules/gui/beos/VlcWrapper.cpp b/modules/gui/beos/VlcWrapper.cpp index 96a97e3938..fc613cc6aa 100644 --- a/modules/gui/beos/VlcWrapper.cpp +++ b/modules/gui/beos/VlcWrapper.cpp @@ -2,7 +2,7 @@ * vlc_wrapper.h: BeOS plugin for vlc (derived from MacOS X port ) ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: VlcWrapper.cpp,v 1.2 2002/08/06 10:54:34 tcastley Exp $ + * $Id: VlcWrapper.cpp,v 1.3 2002/08/18 11:32:06 titer Exp $ * * Authors: Florian G. Pflug * Jon Lech Johansen @@ -452,7 +452,7 @@ void Intf_VLCWrapper::openNetHTTP(BString o_addr) void Intf_VLCWrapper::toggleMute( ) { - input_ToggleMute( p_intf->p_sys->p_input ); + /*input_ToggleMute( p_intf->p_sys->p_input );*/ } /* menus management */ -- 2.39.2