Skip to content

V
vlc-gpu
Commit 0ace3bb2 authored by Eric Petit's avatar Eric Petit
Browse files
Options

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).
parent 764fd89e
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 14 deletions
configure
View file @ 0ace3bb2
...@@ -3429,7 +3429,7 @@ fi ...@@ -3429,7 +3429,7 @@ fi
save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"; CFLAGS="${save_CFLAGS}" save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"; CFLAGS="${save_CFLAGS}"
vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" vlc_LDFLAGS="${vlc_LDFLAGS} -lbe"
plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" 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" ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind"
;; ;;
x*) x*)
...@@ -4487,6 +4487,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ...@@ -4487,6 +4487,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm"
imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm" imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm"
i420_rgb_LDFLAGS="${i420_rgb_LDFLAGS} -lm" i420_rgb_LDFLAGS="${i420_rgb_LDFLAGS} -lm"
faad_LDFLAGS="${faad_LDFLAGS} -lm"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
...@@ -5665,7 +5666,7 @@ esac ...@@ -5665,7 +5666,7 @@ esac
BUILTINS="${BUILTINS}" BUILTINS="${BUILTINS}"
PLUGINS="${PLUGINS} misc/dummy/dummy misc/null/null" 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} 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/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" #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" ...@@ -5677,12 +5678,18 @@ PLUGINS="${PLUGINS} audio_output/file"
#PLUGINS="${PLUGINS} visualization/scope/scope" #PLUGINS="${PLUGINS} visualization/scope/scope"
PLUGINS="${PLUGINS} video_chroma/i420_rgb video_chroma/i420_yuy2 video_chroma/i422_yuy2 video_chroma/i420_ymga" 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" 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" 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" THREEDNOW_MODULES="misc/memcpy/memcpy3dn codec/a52old/imdct/imdct3dn codec/a52old/downmix/downmix3dn"
SSE_MODULES="codec/a52old/imdct/imdctsse codec/a52old/downmix/downmixsse" 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" 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 $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6
echo "configure:5688: checking if \$CC groks MMX inline assembly" >&5 echo "configure:5688: checking if \$CC groks MMX inline assembly" >&5
if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then 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 ...@@ -7019,7 +7026,7 @@ echo "configure:7012: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
then then
echo "$ac_t""${real_ffmpeg_tree}/libavcodec/libavcodec.a" 1>&6 echo "$ac_t""${real_ffmpeg_tree}/libavcodec/libavcodec.a" 1>&6
BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" 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" ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
...@@ -7027,7 +7034,7 @@ echo "configure:7012: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 ...@@ -7027,7 +7034,7 @@ echo "configure:7012: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5
fi fi
else else
CFLAGS="${save_CFLAGS} ${ffmpeg_CFLAGS}" 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 $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
echo "configure:7033: checking for avcodec_init in -lavcodec" >&5 echo "configure:7033: checking for avcodec_init in -lavcodec" >&5
ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'` 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 ...@@ -7065,7 +7072,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg"
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
{ echo "configure: error: Cannot find libavcodec library..." 1>&2; exit 1; } { echo "configure: error: Cannot find libavcodec library..." 1>&2; exit 1; }
...@@ -7095,7 +7102,7 @@ fi ...@@ -7095,7 +7102,7 @@ fi
faad_CFLAGS="${faad_CFLAGS} -I${with_faad}/include" faad_CFLAGS="${faad_CFLAGS} -I${with_faad}/include"
faad_LDFLAGS="${faad_LDFLAGS} -L${with_faad}/lib" faad_LDFLAGS="${faad_LDFLAGS} -L${with_faad}/lib"
fi fi
faad_LDFLAGS="${faad_LDFLAGS} -lm" faad_LDFLAGS="${faad_LDFLAGS}"
# Check whether --with-faad-tree or --without-faad-tree was given. # Check whether --with-faad-tree or --without-faad-tree was given.
if test "${with_faad_tree+set}" = set; then if test "${with_faad_tree+set}" = set; then
......
configure.in
View file @ 0ace3bb2
...@@ -114,7 +114,7 @@ case "x${target_os}" 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}" save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"; CFLAGS="${save_CFLAGS}"
vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" vlc_LDFLAGS="${vlc_LDFLAGS} -lbe"
plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" 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" ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind"
;; ;;
x*) x*)
...@@ -196,6 +196,7 @@ AC_CHECK_LIB(m,pow, ...@@ -196,6 +196,7 @@ AC_CHECK_LIB(m,pow,
imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm"
imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm" imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm"
i420_rgb_LDFLAGS="${i420_rgb_LDFLAGS} -lm" i420_rgb_LDFLAGS="${i420_rgb_LDFLAGS} -lm"
faad_LDFLAGS="${faad_LDFLAGS} -lm"
) )
dnl Check for pthreads - borrowed from XMMS dnl Check for pthreads - borrowed from XMMS
...@@ -439,7 +440,7 @@ dnl default modules ...@@ -439,7 +440,7 @@ dnl default modules
dnl dnl
BUILTINS="${BUILTINS}" BUILTINS="${BUILTINS}"
PLUGINS="${PLUGINS} misc/dummy/dummy misc/null/null" 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} 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/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" #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" ...@@ -451,6 +452,11 @@ PLUGINS="${PLUGINS} audio_output/file"
#PLUGINS="${PLUGINS} visualization/scope/scope" #PLUGINS="${PLUGINS} visualization/scope/scope"
PLUGINS="${PLUGINS} video_chroma/i420_rgb video_chroma/i420_yuy2 video_chroma/i422_yuy2 video_chroma/i420_ymga" 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
dnl Accelerated modules dnl Accelerated modules
dnl dnl
...@@ -460,6 +466,11 @@ THREEDNOW_MODULES="misc/memcpy/memcpy3dn codec/a52old/imdct/imdct3dn codec/a52ol ...@@ -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" 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" 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_CACHE_CHECK([if \$CC groks MMX inline assembly],
[ac_cv_mmx_inline], [ac_cv_mmx_inline],
[CFLAGS="${save_CFLAGS}" [CFLAGS="${save_CFLAGS}"
...@@ -1048,7 +1059,7 @@ then ...@@ -1048,7 +1059,7 @@ then
dnl Use a custom libffmpeg dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" 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" ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec"
else else
dnl The given libavcodec wasn't built dnl The given libavcodec wasn't built
...@@ -1057,10 +1068,10 @@ then ...@@ -1057,10 +1068,10 @@ then
fi fi
else else
CFLAGS="${save_CFLAGS} ${ffmpeg_CFLAGS}" CFLAGS="${save_CFLAGS} ${ffmpeg_CFLAGS}"
LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS} -lm" LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS}"
AC_CHECK_LIB(avcodec, avcodec_init, [ AC_CHECK_LIB(avcodec, avcodec_init, [
BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg"
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" ], ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" ],
[ AC_MSG_ERROR([Cannot find libavcodec library...]) ]) [ AC_MSG_ERROR([Cannot find libavcodec library...]) ])
LDFLAGS="${save_LDFLAGS}" LDFLAGS="${save_LDFLAGS}"
CFLAGS="${save_CFLAGS}" CFLAGS="${save_CFLAGS}"
...@@ -1081,7 +1092,7 @@ then ...@@ -1081,7 +1092,7 @@ then
faad_CFLAGS="${faad_CFLAGS} -I${with_faad}/include" faad_CFLAGS="${faad_CFLAGS} -I${with_faad}/include"
faad_LDFLAGS="${faad_LDFLAGS} -L${with_faad}/lib" faad_LDFLAGS="${faad_LDFLAGS} -L${with_faad}/lib"
fi fi
faad_LDFLAGS="${faad_LDFLAGS} -lm" faad_LDFLAGS="${faad_LDFLAGS}"
AC_ARG_WITH(faad-tree, AC_ARG_WITH(faad-tree,
[ --with-faad-tree=PATH faad tree for static linking]) [ --with-faad-tree=PATH faad tree for static linking])
......
modules/gui/beos/VlcWrapper.cpp
View file @ 0ace3bb2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlc_wrapper.h: BeOS plugin for vlc (derived from MacOS X port ) * vlc_wrapper.h: BeOS plugin for vlc (derived from MacOS X port )
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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 <fgp@phlo.org> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -452,7 +452,7 @@ void Intf_VLCWrapper::openNetHTTP(BString o_addr) ...@@ -452,7 +452,7 @@ void Intf_VLCWrapper::openNetHTTP(BString o_addr)
void Intf_VLCWrapper::toggleMute( ) void Intf_VLCWrapper::toggleMute( )
{ {
input_ToggleMute( p_intf->p_sys->p_input ); /*input_ToggleMute( p_intf->p_sys->p_input );*/
} }
/* menus management */ /* menus management */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment