Commit a2d1d9f8 authored by Gildas Bazin's avatar Gildas Bazin

* modules/access/vcd/cdrom.c: small win32 bugfix.
* configure.ac.in: on win32 we link ws2_32 with the slp plugin.
parent 780ba1b9
...@@ -2607,6 +2607,9 @@ then ...@@ -2607,6 +2607,9 @@ then
then then
PLUGINS="${PLUGINS} slp" PLUGINS="${PLUGINS} slp"
LDFLAGS_slp="${LDFLAGS_slp} -lslp" LDFLAGS_slp="${LDFLAGS_slp} -lslp"
if test "x${SYS}" != "xmingw32"; then
LDFLAGS_slp="${LDFLAGS_slp} -lws2_32"
fi
fi fi
else else
AC_MSG_CHECKING(for slp headers in ${with_slp}) AC_MSG_CHECKING(for slp headers in ${with_slp})
...@@ -2616,6 +2619,9 @@ then ...@@ -2616,6 +2619,9 @@ then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} slp" PLUGINS="${PLUGINS} slp"
LDFLAGS_slp="${LDFLAGS_slp} -L${with_slp} -lslp" LDFLAGS_slp="${LDFLAGS_slp} -L${with_slp} -lslp"
if test "x${SYS}" != "xmingw32"; then
LDFLAGS_slp="${LDFLAGS_slp} -lws2_32"
fi
CPPFLAGS_slp="${CPPFLAGS_slp} -I${with_slp}" CPPFLAGS_slp="${CPPFLAGS_slp} -I${with_slp}"
else else
dnl No libslp could be found, sorry dnl No libslp could be found, sorry
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* cdrom.c: cdrom tools * cdrom.c: cdrom tools
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: cdrom.c,v 1.7 2003/01/27 21:35:06 jobi Exp $ * $Id: cdrom.c,v 1.8 2003/03/10 00:12:53 gbazin Exp $
* *
* Authors: Johan Bilien <jobi@via.ecp.fr> * Authors: Johan Bilien <jobi@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -1198,7 +1198,7 @@ static int win32_vcd_open( vlc_object_t * p_this, const char *psz_dev, ...@@ -1198,7 +1198,7 @@ static int win32_vcd_open( vlc_object_t * p_this, const char *psz_dev,
else else
{ {
FreeLibrary( hASPI ); FreeLibrary( hASPI );
msg_Dbg( p_this, "%s: is not a cdrom drive", msg_Dbg( p_this, "%c: is not a cdrom drive",
psz_dev[0] ); psz_dev[0] );
return -1; return -1;
} }
......
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