mirror of
https://github.com/mpv-player/mpv
synced 2025-02-17 21:27:08 +00:00
10l noticed by Steven M. Schultz <sms@2BSD.COM> and a bit cleaned up
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9642 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
7218ad5876
commit
255abc60b0
2
Makefile
2
Makefile
@ -38,7 +38,7 @@ AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
|
|||||||
CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
|
CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
|
||||||
COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
|
COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
|
||||||
|
|
||||||
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(SMBSUPPORT_INC) $(FRIBIDI_INC) # -Wall
|
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(FRIBIDI_INC) # -Wall
|
||||||
|
|
||||||
ifeq ($(TARGET_ALTIVEC),yes)
|
ifeq ($(TARGET_ALTIVEC),yes)
|
||||||
ifeq ($(TARGET_OS),Darwin)
|
ifeq ($(TARGET_OS),Darwin)
|
||||||
|
8
configure
vendored
8
configure
vendored
@ -2340,7 +2340,7 @@ if test "$_smbsupport" = auto; then
|
|||||||
#include <libsmbclient.h>
|
#include <libsmbclient.h>
|
||||||
int main(void) { smbc_opendir("smb://"); return 0; }
|
int main(void) { smbc_opendir("smb://"); return 0; }
|
||||||
EOF
|
EOF
|
||||||
if cc_check $_ld_smb $_inc_smb ; then
|
if cc_check -lsmbclient ; then
|
||||||
# this is not working for me becouse it needs -ldl and some NIS (YP) libs
|
# this is not working for me becouse it needs -ldl and some NIS (YP) libs
|
||||||
# $_ld_dl and -lyp ? should be added
|
# $_ld_dl and -lyp ? should be added
|
||||||
_smbsupport=yes
|
_smbsupport=yes
|
||||||
@ -2348,13 +2348,10 @@ EOF
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$_smbsupport" = yes; then
|
if test "$_smbsupport" = yes; then
|
||||||
_ld_smb=" -L/usr/lib -lsmbclient"
|
_ld_smb="-lsmbclient"
|
||||||
_inc_smb=" -I/usr/include "
|
|
||||||
_def_smbsupport="#define LIBSMBCLIENT"
|
_def_smbsupport="#define LIBSMBCLIENT"
|
||||||
_inputmodules="smb $_inputmodules"
|
_inputmodules="smb $_inputmodules"
|
||||||
else
|
else
|
||||||
_ld_smb=""
|
|
||||||
_inc_smb=""
|
|
||||||
_def_smbsupport="#undef LIBSMBCLIENT"
|
_def_smbsupport="#undef LIBSMBCLIENT"
|
||||||
_noinputmodules="smb $_noinputmodules"
|
_noinputmodules="smb $_noinputmodules"
|
||||||
fi
|
fi
|
||||||
@ -5096,7 +5093,6 @@ LIBLZO_LIB= $_ld_liblzo
|
|||||||
MAD_LIB = $_ld_mad
|
MAD_LIB = $_ld_mad
|
||||||
VORBIS_LIB = $_ld_vorbis $_ld_libdv
|
VORBIS_LIB = $_ld_vorbis $_ld_libdv
|
||||||
FAAD_LIB = $_ld_faad
|
FAAD_LIB = $_ld_faad
|
||||||
SMBSUPPORT_INC = $_inc_smb
|
|
||||||
SMBSUPPORT_LIB = $_ld_smb
|
SMBSUPPORT_LIB = $_ld_smb
|
||||||
XMMS_PLUGINS = $_xmms
|
XMMS_PLUGINS = $_xmms
|
||||||
XMMS_LIB = $_xmms_lib
|
XMMS_LIB = $_xmms_lib
|
||||||
|
Loading…
Reference in New Issue
Block a user