Commit 2328faeb authored by Gildas Bazin's avatar Gildas Bazin

* configure.ac.in: fix for the mingw32 build. The gtk plugin may also need mingwex.
* modules/demux/mpeg/ts.c: added an #include <stdint.h> to make mingw32 happy when
   compiled with libdvbpsi.
* Makefile.am: fixed dependency problem with share/vlc_win32_rc.rc.
parent afc5d209
...@@ -357,7 +357,7 @@ vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default) ...@@ -357,7 +357,7 @@ vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default)
# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
# old automake-1.5 bug (automake/279). # old automake-1.5 bug (automake/279).
DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc)
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
@rm -f vlc$(EXEEXT) @rm -f vlc$(EXEEXT)
......
...@@ -161,7 +161,8 @@ if test x$SYS = xmingw32 ...@@ -161,7 +161,8 @@ if test x$SYS = xmingw32
then then
AC_CHECK_LIB(mingwex,opendir, AC_CHECK_LIB(mingwex,opendir,
AC_CHECK_LIB(mingw32,opendir,LDFLAGS_vlc="${LDFLAGS_vlc}", AC_CHECK_LIB(mingw32,opendir,LDFLAGS_vlc="${LDFLAGS_vlc}",
LDFLAGS_vlc="${LDFLAGS_vlc} -lmingwex") [LDFLAGS_vlc="${LDFLAGS_vlc} -lmingwex"
LDFLAGS_gtk="${LDFLAGS_gtk} -lmingwex"])
) )
fi fi
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mpeg_ts.c : Transport Stream input module for vlc * mpeg_ts.c : Transport Stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: ts.c,v 1.6 2002/09/26 22:40:24 massiot Exp $ * $Id: ts.c,v 1.7 2002/10/12 21:31:56 gbazin Exp $
* *
* Authors: Henri Fallon <henri@via.ecp.fr> * Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr> * Johan Bilien <jobi@via.ecp.fr>
...@@ -29,6 +29,10 @@ ...@@ -29,6 +29,10 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_STDINT_H
# include <stdint.h> /* uint8_t */
#endif
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/input.h> #include <vlc/input.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment