RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 23:32:26 +00:00
Code Issues Releases Wiki Activity

syncfb, mp1e, opendivx removed/disabled

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5600 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-04-13 17:28:33 +00:00
parent f87af21672
commit 842b44dcd9
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -60,14 +60,14 @@ V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA
AO_LIBS = -Llibao2 -lao2
A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB)
CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lg72x -lg72x -Lmp3lib -lMP3 -Lliba52 -la52 -Lxa -lxa -Llibmpeg2 -lmpeg2 $(AV_LIB) -Llibfame -lfame
CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 -Lliba52 -la52 -Lxa -lxa -Llibmpeg2 -lmpeg2 $(AV_LIB) -Llibfame -lfame
COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(NEW_INPUT_LIB) $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) -Lpostproc -lpostproc $(DECORE_LIB) -Llinux -losdep $(TERMCAP_LIB) $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) -lm
ifeq ($(VIDIX),yes)
MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix
endif
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) # -Wall
PARTS = libfame g72x libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec opendivx libao2 drivers drivers/syncfb linux postproc xa input
PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers drivers/syncfb linux postproc xa input
ifeq ($(VIDIX),yes)
PARTS += libdha vidix
endif
@ -109,7 +109,7 @@ all: $(ALL_PRG)
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
COMMON_DEPS = libfame/libfame.a g72x/libg72x.a libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a opendivx/libdecore.a xa/libxa.a input/libinput.a
COMMON_DEPS = libfame/libfame.a libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a input/libinput.a
ifeq ($(VIDIX),yes)
COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
@ -162,18 +162,12 @@ liba52/liba52.a:
mp3lib/libMP3.a:
$(MAKE) -C mp3lib
opendivx/libdecore.a:
$(MAKE) -C opendivx
libdha/libdha.so:
$(MAKE) -C libdha
vidix/libvidix.a:
$(MAKE) -C vidix
# encore/libencore.a:
# $(MAKE) -C encore
Gui/libgui.a:
$(MAKE) -C Gui
@ -186,9 +180,6 @@ postproc/libpostproc.a:
xa/libxa.a:
$(MAKE) -C xa
g72x/libg72x.a:
$(MAKE) -C g72x
input/libinput.a:
$(MAKE) -C input

28
configure vendored
View File

@ -129,13 +129,13 @@ Optional features:
--disable-xanim disable XAnim DLL support [autodetect]
--disable-xvid disable XviD codec [autodetect]
--disable-divx4linux disable DivX4linux codec [autodetect]
--disable-opendivx disable OpenDivx codec [enable]
--enable-opendivx enable _old_ OpenDivx codec [disable]
--enable-vorbis build with OggVorbis support [autodetect]
--enable-faad build with FAAD (AAC) support [autodetect]
--disable-iconv do not use iconv(3) function [autodetect]
--disable-rtc disable RTC (/dev/rtc) on Linux [autodetect]
--disable-mp1e disable libmp1e support
(use this option if it does not compile) [enable]
--enable-mp1e enable libmp1e support
(use this option if it does not compile) [disable]
--disable-libdv disable libdv 0.9.5 support [autodetect]
--disable-streaming disable network streaming support
(support for: http/mms/rtp) [enable]
@ -764,7 +764,7 @@ _prefix="/usr/local"
# If autodetection is available then the third state is: auto
_libavcodec=auto
_libavcodecso=no # changed default to no as it causes problems - atmos
_mp1e=auto
_mp1e=no
_mencoder=yes
_x11=auto
_dga=auto # 1 2 no auto
@ -1931,16 +1931,16 @@ fi
echores "$_mga"
echocheck "syncfb"
_syncfb=no
test "$_mga" = yes && _syncfb=yes
if test "$_syncfb" = yes ; then
_def_syncfb='#define HAVE_SYNCFB 1'
_vosrc="$_vosrc vo_syncfb.c"
else
_def_syncfb='#undef HAVE_SYNCFB'
fi
echores "$_syncfb"
# echocheck "syncfb"
# _syncfb=no
# test "$_mga" = yes && _syncfb=yes
# if test "$_syncfb" = yes ; then
# _def_syncfb='#define HAVE_SYNCFB 1'
# _vosrc="$_vosrc vo_syncfb.c"
# else
# _def_syncfb='#undef HAVE_SYNCFB'
# fi
# echores "$_syncfb"
echocheck "xmga"