diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | divx4_vbr.c | 5 |
3 files changed, 25 insertions, 4 deletions
@@ -163,14 +163,14 @@ GUI_LIBS = -LGui -lgui endif $(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 $(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o ifeq ($(MENCODER),yes) $(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 # Every mplayer dependancy depends on version.h, to force building version.h @@ -1114,6 +1114,21 @@ else 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" cat > $TMPC << EOF #include <malloc.h> @@ -2544,6 +2559,7 @@ echocheck "streaming" # FIXME streaming check if test "$_streaming" != no ; then _def_streaming='#define STREAMING 1' + _ld_streaming="$_ld_sock" _inputmodules="network $_inputmodules" else _def_streaming='#undef STREAMING' @@ -2730,6 +2746,7 @@ EXTRA_INC = $_inc_extra $_inc_gtk WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\" STREAMING = $_streaming +STREAMING_LIB = $_ld_streaming VO2 = $_vo2 @@ -2873,6 +2890,9 @@ $_def_rtc /* Define this if your system has the header file for the OSS sound interface */ $_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 */ $_def_malloc diff --git a/divx4_vbr.c b/divx4_vbr.c index 10ae2127ca..8b7d8debbf 100644 --- a/divx4_vbr.c +++ b/divx4_vbr.c @@ -43,11 +43,12 @@ #include <dlfcn.h> #include <math.h> -#ifndef __FreeBSD__ +#include "config.h" + +#ifdef HAVE_STDINT_H #include <stdint.h> #endif -#include "config.h" #include "divx4_vbr.h" |