mirror of
https://github.com/mpv-player/mpv
synced 2024-12-28 10:02:17 +00:00
The patch add a library detection to configure and the usage of the
detected libraries in Makefile. based on patch by Alexander.Gottwald@informatik.tu-chemnitz.de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9317 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d90e9cb669
commit
dd5bfcbc7e
6
Makefile
6
Makefile
@ -208,7 +208,7 @@ endif
|
||||
|
||||
$(PRG): $(MPLAYER_DEP)
|
||||
./darwinfixlib.sh $(MPLAYER_DEP)
|
||||
$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(STATIC_LIB) $(ARCH_LIB) -lm
|
||||
$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm
|
||||
|
||||
mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
|
||||
winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
|
||||
@ -228,7 +228,7 @@ $(PRG_FIBMAP): fibmap_mplayer.o
|
||||
ifeq ($(MENCODER),yes)
|
||||
$(PRG_MENCODER): $(MENCODER_DEP)
|
||||
./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a
|
||||
$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(ARCH_LIB) -lm
|
||||
$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm
|
||||
endif
|
||||
|
||||
codecs.conf.h: $(PRG_CFG)
|
||||
@ -245,7 +245,7 @@ $(MPLAYER_DEP): version.h
|
||||
$(MENCODER_DEP): version.h
|
||||
|
||||
$(PRG_CFG): version.h codec-cfg.c codec-cfg.h
|
||||
$(CC) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML
|
||||
$(CC) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(I18NLIBS)
|
||||
|
||||
install: $(ALL_PRG)
|
||||
ifeq ($(VIDIX),yes)
|
||||
|
14
configure
vendored
14
configure
vendored
@ -1555,13 +1555,16 @@ fi
|
||||
# Checking for localization ...
|
||||
# CSAK EGY MARADHAT - A HEGYLAKO
|
||||
echocheck "i18n"
|
||||
if test "$_i18n" = auto ; then
|
||||
if test "$_i18n" != no ; then
|
||||
cat > $TMPC <<EOF
|
||||
#include <libintl.h>
|
||||
int main(void) { gettext("test"); return 0; }
|
||||
EOF
|
||||
_i18n=no
|
||||
cc_check && _i18n=yes
|
||||
_i18n_libs=""
|
||||
for i18n_lib in "" "-lintl"; do
|
||||
cc_check $i18n_lib && _i18n=yes && _i18n_libs=$i18n_lib && break
|
||||
done
|
||||
fi
|
||||
if test "$_i18n" = yes ; then
|
||||
_def_i18n='#define USE_I18N 1'
|
||||
@ -1569,7 +1572,11 @@ if test "$_i18n" = yes ; then
|
||||
else
|
||||
_def_i18n='#undef USE_I18N'
|
||||
fi
|
||||
echores "$_i18n"
|
||||
if test -z $_i18n_libs ; then
|
||||
echores "$_i18n"
|
||||
else
|
||||
echores "$_i18n (using $_i18n_libs)"
|
||||
fi
|
||||
|
||||
|
||||
# Checking for setlocale() ...
|
||||
@ -4778,6 +4785,7 @@ PP_LIB = $_ld_pp
|
||||
SHARED_PP = $_shared_pp
|
||||
CONFIG_RISKY = yes
|
||||
LIBMENU = $_menu
|
||||
I18NLIBS = $_i18n_libs
|
||||
|
||||
OPENDIVX = $_opendivx
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user