mirror of
https://github.com/mpv-player/mpv
synced 2024-09-09 01:16:56 +02:00
small fixes (=> HAVE_STDINT_H is now defined)
added STREAMING_LIB in config.mak/Makefile Note: compile via a configure && make without glitches on SunOS git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3920 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
5276910d70
commit
4ff3fa6753
4
Makefile
4
Makefile
@ -163,14 +163,14 @@ GUI_LIBS = -LGui -lgui
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
$(PRG): $(MPLAYER_DEP)
|
$(PRG): $(MPLAYER_DEP)
|
||||||
$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) -lm
|
$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(STREAMING_LIB) -lm
|
||||||
|
|
||||||
$(PRG_FIBMAP): fibmap_mplayer.o
|
$(PRG_FIBMAP): fibmap_mplayer.o
|
||||||
$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
|
$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
|
||||||
|
|
||||||
ifeq ($(MENCODER),yes)
|
ifeq ($(MENCODER),yes)
|
||||||
$(PRG_MENCODER): $(MENCODER_DEP)
|
$(PRG_MENCODER): $(MENCODER_DEP)
|
||||||
$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(CSS_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) -lm
|
$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(CSS_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) $(STREAMING_LIB) -lm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Every mplayer dependancy depends on version.h, to force building version.h
|
# Every mplayer dependancy depends on version.h, to force building version.h
|
||||||
|
20
configure
vendored
20
configure
vendored
@ -1114,6 +1114,21 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
echocheck "stdint.h"
|
||||||
|
cat > $TMPC << EOF
|
||||||
|
#include <stdint.h>
|
||||||
|
int main(void) { return 0; }
|
||||||
|
EOF
|
||||||
|
_stdint=no
|
||||||
|
cc_check && _stdint=yes
|
||||||
|
if test "$_stdint" = yes ; then
|
||||||
|
_def_stdint='#define HAVE_STDINT_H 1'
|
||||||
|
else
|
||||||
|
_def_stdint='#undef HAVE_STDINT_H'
|
||||||
|
fi
|
||||||
|
echores "$_stdint"
|
||||||
|
|
||||||
|
|
||||||
echocheck "malloc.h"
|
echocheck "malloc.h"
|
||||||
cat > $TMPC << EOF
|
cat > $TMPC << EOF
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
@ -2544,6 +2559,7 @@ echocheck "streaming"
|
|||||||
# FIXME streaming check
|
# FIXME streaming check
|
||||||
if test "$_streaming" != no ; then
|
if test "$_streaming" != no ; then
|
||||||
_def_streaming='#define STREAMING 1'
|
_def_streaming='#define STREAMING 1'
|
||||||
|
_ld_streaming="$_ld_sock"
|
||||||
_inputmodules="network $_inputmodules"
|
_inputmodules="network $_inputmodules"
|
||||||
else
|
else
|
||||||
_def_streaming='#undef STREAMING'
|
_def_streaming='#undef STREAMING'
|
||||||
@ -2730,6 +2746,7 @@ EXTRA_INC = $_inc_extra $_inc_gtk
|
|||||||
WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\"
|
WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\"
|
||||||
|
|
||||||
STREAMING = $_streaming
|
STREAMING = $_streaming
|
||||||
|
STREAMING_LIB = $_ld_streaming
|
||||||
|
|
||||||
VO2 = $_vo2
|
VO2 = $_vo2
|
||||||
|
|
||||||
@ -2873,6 +2890,9 @@ $_def_rtc
|
|||||||
/* Define this if your system has the header file for the OSS sound interface */
|
/* Define this if your system has the header file for the OSS sound interface */
|
||||||
$_def_sys_soundcard
|
$_def_sys_soundcard
|
||||||
|
|
||||||
|
/* Define this if your system has the "stdint.h" header file */
|
||||||
|
$_def_stdint
|
||||||
|
|
||||||
/* Define this if your system has the "malloc.h" header file */
|
/* Define this if your system has the "malloc.h" header file */
|
||||||
$_def_malloc
|
$_def_malloc
|
||||||
|
|
||||||
|
@ -43,11 +43,12 @@
|
|||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#ifndef __FreeBSD__
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_STDINT_H
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include "divx4_vbr.h"
|
#include "divx4_vbr.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user