Commit 1485dd1a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Set SOCKET_LIBS on Windows too

parent 75532d5c
...@@ -179,6 +179,7 @@ dnl ...@@ -179,6 +179,7 @@ dnl
dnl Set default values dnl Set default values
dnl dnl
LDFLAGS_vlc="${LDFLAGS}" LDFLAGS_vlc="${LDFLAGS}"
SOCKET_LIBS=""
dnl dnl
dnl Check the operating system dnl Check the operating system
...@@ -348,8 +349,9 @@ case "${host_os}" in ...@@ -348,8 +349,9 @@ case "${host_os}" in
VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([win32text],[-lgdi32]) VLC_ADD_LIBS([win32text],[-lgdi32])
VLC_ADD_LIBS([cdda vcdx sdl_image vout_sdl],[-lwinmm]) VLC_ADD_LIBS([cdda vcdx sdl_image vout_sdl],[-lwinmm])
VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap stream_out_standard stream_out_select stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32]) VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap stream_out_standard stream_out_select stream_out_rtp stream_out_raop vod_rtsp access_realrtsp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
VLC_ADD_LIBS([filesystem], [-lshlwapi]) VLC_ADD_LIBS([filesystem], [-lshlwapi])
SOCKET_LIBS="-lws2_32"
dnl dnl
dnl DEP and ASLR options dnl DEP and ASLR options
dnl dnl
...@@ -380,7 +382,8 @@ case "${host_os}" in ...@@ -380,7 +382,8 @@ case "${host_os}" in
fi fi
if test "${SYS}" = "mingwce"; then if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv # add ws2 for closesocket, select, recv
VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap netsync audioscrobbler growl rtp stream_out_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2]) VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap netsync audioscrobbler growl stream_out_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
SOCKET_LIBS="-lws2"
VLC_ADD_LIBS([libvlccore],[-lmmtimer]) VLC_ADD_LIBS([libvlccore],[-lmmtimer])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_wince" ac_default_prefix="`pwd`/_wince"
...@@ -607,21 +610,14 @@ AC_CHECK_FUNCS([accept4 pipe2 eventfd vmsplice sched_getaffinity]) ...@@ -607,21 +610,14 @@ AC_CHECK_FUNCS([accept4 pipe2 eventfd vmsplice sched_getaffinity])
AH_BOTTOM([#include <vlc_fixups.h>]) AH_BOTTOM([#include <vlc_fixups.h>])
SOCKET_LIBS=""
AC_CHECK_FUNCS(connect,,[ AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,[ AC_CHECK_LIB(socket,connect,[
VLC_ADD_LIBS([libvlccore cdda],-lsocket) VLC_ADD_LIBS([libvlccore cdda access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp access_output_rtmp stream_out_standard growl_udp remoteosd netsync],[-lsocket])
SOCKET_LIBS="-lsocket" SOCKET_LIBS="-lsocket"
]) ])
]) ])
AC_SUBST(SOCKET_LIBS) AC_SUBST(SOCKET_LIBS)
AC_CHECK_FUNCS(send,,[
AC_CHECK_LIB(socket,send,[
VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp access_output_rtmp stream_out_standard growl_udp remoteosd netsync],[-lsocket])
])
])
dnl Check for socklen_t dnl Check for socklen_t
AH_TEMPLATE(socklen_t, [Define to `int' if <sys/socket.h> does not define.]) AH_TEMPLATE(socklen_t, [Define to `int' if <sys/socket.h> does not define.])
......
...@@ -8,7 +8,7 @@ librtp_plugin_la_SOURCES = \ ...@@ -8,7 +8,7 @@ librtp_plugin_la_SOURCES = \
session.c \ session.c \
xiph.c xiph.c
librtp_plugin_la_CFLAGS = $(AM_CFLAGS) librtp_plugin_la_CFLAGS = $(AM_CFLAGS)
librtp_plugin_la_LIBADD = $(AM_LIBADD) librtp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
librtp_plugin_la_DEPENDENCIES = librtp_plugin_la_DEPENDENCIES =
if HAVE_GCRYPT if HAVE_GCRYPT
......
...@@ -44,7 +44,7 @@ libvlc_LTLIBRARIES += \ ...@@ -44,7 +44,7 @@ libvlc_LTLIBRARIES += \
libstream_out_rtp_plugin_la_SOURCES = \ libstream_out_rtp_plugin_la_SOURCES = \
rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c vod.c rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c vod.c
libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS) libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS)
libstream_out_rtp_plugin_la_LIBADD = $(AM_LIBADD) libstream_out_rtp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
libstream_out_rtp_plugin_la_DEPENDENCIES = libstream_out_rtp_plugin_la_DEPENDENCIES =
if HAVE_GCRYPT if HAVE_GCRYPT
SRTP_CFLAGS = -I$(top_srcdir)/libs/srtp SRTP_CFLAGS = -I$(top_srcdir)/libs/srtp
......
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