* Big clean-up to allow compiling every module as plugins. * Added bytes_swap.h to provide ntoh() and htol() on Win32. With this change we don't have to link winsock2 with every plugin anymore. This should also give us a slight speed increase. * Added #define WIN32_LEAN_AND_MEAN in threads.h to speed-up compilation on Win32. * Modified ac_downmix_3dn and sse so they compile with the latest gcc for Win32. (PS: the dvdread plugin doesn't compile yet on Win32)

b6188286 · Gildas Bazin · b8ff945d · b6188286 · b6188286 · b6188286
Commit b6188286 authored Nov 25, 2001 by Gildas Bazin
28 changed files
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -70,6 +70,7 @@ LIB_ALTIVEC = @LIB_ALTIVEC@
 LIB_ARTS = @LIB_ARTS@
 LIB_BEOS = @LIB_BEOS@
 LIB_DARWIN = @LIB_DARWIN@
+LIB_DIRECTX = @LIB_DIRECTX@
 LIB_DVD = @LIB_DVD@
 LIB_DVD_PLUGIN = @LIB_DVD_PLUGIN@
 LIB_DVDREAD = @LIB_DVDREAD@
@@ -79,15 +80,15 @@ LIB_GGI = @LIB_GGI@
 LIB_GLIDE = @LIB_GLIDE@
 LIB_GNOME = @LIB_GNOME@
 LIB_GTK = @LIB_GTK@
-LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
 LIB_KDE = @LIB_KDE@
+LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
 LIB_MACOSX = @LIB_MACOSX@
-LIB_QNX = @LIB_QNX@
 LIB_NCURSES = @LIB_NCURSES@
+LIB_QNX = @LIB_QNX@
 LIB_QT = @LIB_QT@
-LIB_TS = @LIB_TS@
+LIB_RC = @LIB_RC@
 LIB_SDL = @LIB_SDL@
-LIB_DIRECTX = @LIB_DIRECTX@
+LIB_TS = @LIB_TS@
 LIB_X11 = @LIB_X11@
 LIB_XVIDEO = @LIB_XVIDEO@
 LIB_YUV = @LIB_YUV@

--- a/configure
+++ b/configure
@@ -72,7 +72,7 @@ ac_help="$ac_help
 ac_help="$ac_help
  --disable-directx       Windows DirectX support (default enabled on WIN32)"
 ac_help="$ac_help
--with-directx=[name] Windows DirectX support (default enabled)"
+  --with-directx-path=path Windows DirectX headers and libraries"
 ac_help="$ac_help
  --with-glide[=name]     Glide (3dfx) support (default disabled)"
 ac_help="$ac_help
@@ -4120,6 +4120,8 @@ else
 fi
 fi
+LIB_TS="-lws2_32"
+LIB_RC="-lws2_32"
 fi
@@ -4129,17 +4131,17 @@ for ac_hdr in winioctl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4133: checking for $ac_hdr" >&5
+echo "configure:4135: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4138 "configure"
+#line 4140 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4172,17 +4174,17 @@ for ac_hdr in sys/ioctl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4176: checking for $ac_hdr" >&5
+echo "configure:4178: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4181 "configure"
+#line 4183 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4208,17 +4210,17 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4212: checking for $ac_hdr" >&5
+echo "configure:4214: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4217 "configure"
+#line 4219 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4248,7 +4250,7 @@ done
  LINUX_DVD_STRUCT=0
  OPENBSD_DVD_STRUCT=0
        cat > conftest.$ac_ext <<EOF
-#line 4252 "configure"
+#line 4254 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -4261,7 +4263,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
    cat > conftest.$ac_ext <<EOF
-#line 4265 "configure"
+#line 4267 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -4281,7 +4283,7 @@ fi
 rm -f conftest*
        cat > conftest.$ac_ext <<EOF
-#line 4285 "configure"
+#line 4287 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -4294,7 +4296,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
    cat > conftest.$ac_ext <<EOF
-#line 4298 "configure"
+#line 4300 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -4314,7 +4316,7 @@ fi
 rm -f conftest*
        cat > conftest.$ac_ext <<EOF
-#line 4318 "configure"
+#line 4320 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -4333,7 +4335,7 @@ rm -f conftest*
        NEED_BSDI_LIBDVD=0
  cat > conftest.$ac_ext <<EOF
-#line 4337 "configure"
+#line 4339 "configure"
 #include "confdefs.h"
 #include <dvd.h>
 EOF
@@ -4355,17 +4357,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4359: checking for $ac_hdr" >&5
+echo "configure:4361: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4364 "configure"
+#line 4366 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4405,17 +4407,17 @@ rm -f conftest*
        ac_safe=`echo "sys/scsi/scsi_types.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi/scsi_types.h""... $ac_c" 1>&6
-echo "configure:4409: checking for sys/scsi/scsi_types.h" >&5
+echo "configure:4411: checking for sys/scsi/scsi_types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4414 "configure"
+#line 4416 "configure"
 #include "confdefs.h"
 #include <sys/scsi/scsi_types.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4434,17 +4436,17 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    ac_safe=`echo "sys/scsi/impl/uscsi.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi/impl/uscsi.h""... $ac_c" 1>&6
-echo "configure:4438: checking for sys/scsi/impl/uscsi.h" >&5
+echo "configure:4440: checking for sys/scsi/impl/uscsi.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4443 "configure"
+#line 4445 "configure"
 #include "confdefs.h"
 #include <sys/scsi/impl/uscsi.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4599,7 +4601,7 @@ if test "${enable_pth+set}" = set; then
  enableval="$enable_pth"
   if test x$enableval = xyes; then
    echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6
-echo "configure:4603: checking for pth_init in -lpth" >&5
+echo "configure:4605: checking for pth_init in -lpth" >&5
 ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4607,7 +4609,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lpth  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4611 "configure"
+#line 4613 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4618,7 +4620,7 @@ int main() {
 pth_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4646,7 +4648,7 @@ else
 fi
    cat > conftest.$ac_ext <<EOF
-#line 4650 "configure"
+#line 4652 "configure"
 #include "confdefs.h"
 #include <pth.h>
 EOF
@@ -4773,7 +4775,7 @@ fi
 if test x$enable_vcd != xno
 then
  cat > conftest.$ac_ext <<EOF
-#line 4777 "configure"
+#line 4779 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -4861,7 +4863,7 @@ if test "${enable_esd+set}" = set; then
     # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4865: checking for $ac_word" >&5
+echo "configure:4867: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4912,7 +4914,7 @@ if test "${enable_arts+set}" = set; then
     # Extract the first word of "artsc-config", so it can be a program name with args.
 set dummy artsc-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4916: checking for $ac_word" >&5
+echo "configure:4918: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4979,17 +4981,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4983: checking for $ac_hdr" >&5
+echo "configure:4985: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4988 "configure"
+#line 4990 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5033,17 +5035,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5037: checking for $ac_hdr" >&5
+echo "configure:5039: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5042 "configure"
+#line 5044 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5121,7 +5123,7 @@ fi
  # Extract the first word of "sdl12-config", so it can be a program name with args.
 set dummy sdl12-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5125: checking for $ac_word" >&5
+echo "configure:5127: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5161,7 +5163,7 @@ fi
    # Extract the first word of "sdl11-config", so it can be a program name with args.
 set dummy sdl11-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5165: checking for $ac_word" >&5
+echo "configure:5167: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5202,7 +5204,7 @@ fi
    # Extract the first word of "sdl-config", so it can be a program name with args.
 set dummy sdl-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5206: checking for $ac_word" >&5
+echo "configure:5208: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5248,17 +5250,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5252: checking for $ac_hdr" >&5
+echo "configure:5254: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5257 "configure"
+#line 5259 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5311,32 +5313,23 @@ if test "${enable_directx+set}" = set; then
  enableval="$enable_directx"
   if test "x$enableval" != "xno"
    then
-      PLUGINS="${PLUGINS} directx"
      if test "x$enableval" = "xyes"
-      then
-	# Check whether --with-directx or --without-directx was given.
-if test "${with_directx+set}" = set; then
-  withval="$with_directx"
-  :
-fi
-	if test "x$withval" = "x"
      then
        for ac_hdr in directx.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5330: checking for $ac_hdr" >&5
+echo "configure:5323: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5335 "configure"
+#line 5328 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5356,22 +5349,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
+  PLUGINS="${PLUGINS} directx"
          LIB_DIRECTX="-lgdi32 -ldxguid"  
 else
  echo "$ac_t""no" 1>&6
-{ echo "configure: error: Cannot find DirectX headers !" 1>&2; exit 1; }
 fi
 done
-	else
-        LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid"
-        INCLUDE="${INCLUDE} -I"$withval"/include"
-	fi
      else
        echo $ac_n "checking for directX headers in ${enableval}""... $ac_c" 1>&6
-echo "configure:5373: checking for directX headers in ${enableval}" >&5
+echo "configure:5362: checking for directX headers in ${enableval}" >&5
        if test -f ${enableval}/include/directx.h
        then
+          PLUGINS="${PLUGINS} directx"
          LIB_DIRECTX="-L${enableval}/lib -lgdi32 -ldxguid"
          INCLUDE="${INCLUDE} -I${enableval}/include"
          echo "$ac_t""yes" 1>&6
@@ -5383,22 +5373,30 @@ echo "configure:5373: checking for directX headers in ${enableval}" >&5
    fi 
 else
   if test $SYS = mingw32
+    then
+      # Check whether --with-directx-path or --without-directx-path was given.
+if test "${with_directx_path+set}" = set; then
+  withval="$with_directx_path"
+  :
+fi
+      if test "x$with_directx_path" = "x"
      then
        for ac_hdr in directx.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5392: checking for $ac_hdr" >&5
+echo "configure:5390: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5397 "configure"
+#line 5395 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5422,10 +5420,23 @@ EOF
          LIB_DIRECTX="-lgdi32 -ldxguid" 
 else
  echo "$ac_t""no" 1>&6
-echo "Cannot find DirectX headers !" 
 fi
 done
+      else
+        echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6
+echo "configure:5429: checking for directX headers in ${withval}" >&5
+        if test -f ${with_directx_path}/include/directx.h
+        then
+          PLUGINS="${PLUGINS} directx"
+          LIB_DIRECTX="-L${with_directx_path}/lib -lgdi32 -ldxguid"
+          INCLUDE="${INCLUDE} -I${with_directx_path}/include"
+          echo "$ac_t""yes" 1>&6
+        else
+          echo "$ac_t""no" 1>&6
+          { echo "configure: error: Cannot find ${with_directx_path}/include/directx.h!" 1>&2; exit 1; }
+        fi
+      fi
    fi 
 fi
@@ -5498,7 +5509,7 @@ if test "${enable_gnome+set}" = set; then
    # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5502: checking for $ac_word" >&5
+echo "configure:5513: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5543,17 +5554,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5547: checking for $ac_hdr" >&5
+echo "configure:5558: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5552 "configure"
+#line 5563 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5613,7 +5624,7 @@ fi
  # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5617: checking for $ac_word" >&5
+echo "configure:5628: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5658,17 +5669,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5662: checking for $ac_hdr" >&5
+echo "configure:5673: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5667 "configure"
+#line 5678 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5720,17 +5731,17 @@ if test x$enable_x11 != xno &&
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5724: checking for $ac_hdr" >&5
+echo "configure:5735: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5729 "configure"
+#line 5740 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5783,17 +5794,17 @@ if test x$enable_xvideo != xno &&
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5787: checking for $ac_hdr" >&5
+echo "configure:5798: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5792 "configure"
+#line 5803 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5833,17 +5844,17 @@ if test "${enable_alsa+set}" = set; then
   then
     ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
-echo "configure:5837: checking for sys/asoundlib.h" >&5
+echo "configure:5848: checking for sys/asoundlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5842 "configure"
+#line 5853 "configure"
 #include "confdefs.h"
 #include <sys/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -5860,7 +5871,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  echo "$ac_t""yes" 1>&6
  echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:5864: checking for main in -lasound" >&5
+echo "configure:5875: checking for main in -lasound" >&5
 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -5868,14 +5879,14 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5872 "configure"
+#line 5883 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5989,6 +6000,7 @@ fi
 trap '' 1 2 15
@@ -6183,6 +6195,7 @@ s%@LIB_ALTIVEC@%$LIB_ALTIVEC%g
 s%@LIB_ARTS@%$LIB_ARTS%g
 s%@LIB_BEOS@%$LIB_BEOS%g
 s%@LIB_DARWIN@%$LIB_DARWIN%g
+s%@LIB_DIRECTX@%$LIB_DIRECTX%g
 s%@LIB_DVD@%$LIB_DVD%g
 s%@LIB_DVD_PLUGIN@%$LIB_DVD_PLUGIN%g
 s%@LIB_DVDREAD@%$LIB_DVDREAD%g
@@ -6192,15 +6205,15 @@ s%@LIB_GGI@%$LIB_GGI%g
 s%@LIB_GLIDE@%$LIB_GLIDE%g
 s%@LIB_GNOME@%$LIB_GNOME%g
 s%@LIB_GTK@%$LIB_GTK%g
-s%@LIB_LIBDVDCSS@%$LIB_LIBDVDCSS%g
 s%@LIB_KDE@%$LIB_KDE%g
+s%@LIB_LIBDVDCSS@%$LIB_LIBDVDCSS%g
 s%@LIB_MACOSX@%$LIB_MACOSX%g
-s%@LIB_QNX@%$LIB_QNX%g
 s%@LIB_NCURSES@%$LIB_NCURSES%g
+s%@LIB_QNX@%$LIB_QNX%g
 s%@LIB_QT@%$LIB_QT%g
-s%@LIB_TS@%$LIB_TS%g
+s%@LIB_RC@%$LIB_RC%g
 s%@LIB_SDL@%$LIB_SDL%g
-s%@LIB_DIRECTX@%$LIB_DIRECTX%g
+s%@LIB_TS@%$LIB_TS%g
 s%@LIB_X11@%$LIB_X11%g
 s%@LIB_XVIDEO@%$LIB_XVIDEO%g
 s%@LIB_YUV@%$LIB_YUV%g

--- a/configure.in
+++ b/configure.in
@@ -411,6 +411,8 @@ dnl Windoze specific section
 dnl
 if test $SYS = mingw32; then
 AC_CHECK_TOOL(WINDRES, windres, :)
+LIB_TS="-lws2_32"
+LIB_RC="-lws2_32"
 fi
 dnl
@@ -940,23 +942,16 @@ AC_ARG_ENABLE(directx,
  [  --disable-directx       Windows DirectX support (default enabled on WIN32)],
  [ if test "x$enableval" != "xno"
    then
-      PLUGINS="${PLUGINS} directx"
      if test "x$enableval" = "xyes"
      then
-	AC_ARG_WITH(directx, 
+        AC_CHECK_HEADERS(directx.h,
-	[--with-directx=[name] Windows DirectX support (default enabled)])
+        [ PLUGINS="${PLUGINS} directx"
-	if test "x$withval" = "x"
+          LIB_DIRECTX="-lgdi32 -ldxguid" ] )
-	then
-          AC_CHECK_HEADERS(directx.h, [LIB_DIRECTX="-lgdi32 -ldxguid"], 
-          AC_MSG_ERROR([Cannot find DirectX headers !]))
-	else
-        LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid"
-        INCLUDE="${INCLUDE} -I"$withval"/include"
-	fi
      else
        AC_MSG_CHECKING(for directX headers in ${enableval})
        if test -f ${enableval}/include/directx.h
        then
+          PLUGINS="${PLUGINS} directx"
          LIB_DIRECTX="-L${enableval}/lib -lgdi32 -ldxguid"
          INCLUDE="${INCLUDE} -I${enableval}/include"
          AC_MSG_RESULT(yes)
@@ -967,11 +962,27 @@ AC_ARG_ENABLE(directx,
      fi
    fi ],
  [ if test $SYS = mingw32
+    then
+      AC_ARG_WITH(directx-path, 
+      [  --with-directx-path=path Windows DirectX headers and libraries])
+      if test "x$with_directx_path" = "x"
      then
        AC_CHECK_HEADERS(directx.h,
        [ PLUGINS="${PLUGINS} directx"
-        LIB_DIRECTX="-lgdi32 -ldxguid" ],
+          LIB_DIRECTX="-lgdi32 -ldxguid" ])
-      [ echo "Cannot find DirectX headers !" ])
+      else
+        AC_MSG_CHECKING(for directX headers in ${withval})
+        if test -f ${with_directx_path}/include/directx.h
+        then
+          PLUGINS="${PLUGINS} directx"
+          LIB_DIRECTX="-L${with_directx_path}/lib -lgdi32 -ldxguid"
+          INCLUDE="${INCLUDE} -I${with_directx_path}/include"
+          AC_MSG_RESULT(yes)
+        else
+          AC_MSG_RESULT(no)
+          AC_MSG_ERROR([Cannot find ${with_directx_path}/include/directx.h!])
+        fi
+      fi
    fi ])
 dnl
@@ -1203,6 +1214,7 @@ AC_SUBST(LIB_ALTIVEC)
 AC_SUBST(LIB_ARTS)
 AC_SUBST(LIB_BEOS)
 AC_SUBST(LIB_DARWIN)
+AC_SUBST(LIB_DIRECTX)
 AC_SUBST(LIB_DVD)
 AC_SUBST(LIB_DVD_PLUGIN)
 AC_SUBST(LIB_DVDREAD)
@@ -1212,15 +1224,15 @@ AC_SUBST(LIB_GGI)
 AC_SUBST(LIB_GLIDE)
 AC_SUBST(LIB_GNOME)
 AC_SUBST(LIB_GTK)
-AC_SUBST(LIB_LIBDVDCSS)
 AC_SUBST(LIB_KDE)
+AC_SUBST(LIB_LIBDVDCSS)
 AC_SUBST(LIB_MACOSX)
-AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_NCURSES)
+AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_QT)
-AC_SUBST(LIB_TS)
+AC_SUBST(LIB_RC)
 AC_SUBST(LIB_SDL)
-AC_SUBST(LIB_DIRECTX)
+AC_SUBST(LIB_TS)
 AC_SUBST(LIB_X11)
 AC_SUBST(LIB_XVIDEO)
 AC_SUBST(LIB_YUV)

--- a/extras/libdvdcss/ioctl.h
+++ b/extras/libdvdcss/ioctl.h
@@ -2,7 +2,7 @@
 * ioctl.h: DVD ioctl replacement function
 *****************************************************************************
 * Copyright (C) 1999-2001 VideoLAN
- * $Id: ioctl.h,v 1.8 2001/11/02 13:30:38 massiot Exp $
+ * $Id: ioctl.h,v 1.9 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *
@@ -125,8 +125,12 @@ typedef u_int8_t dvd_key[5];
 typedef u_int8_t dvd_challenge[10];
 #endif
 #if defined( WIN32 )
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 /*****************************************************************************
 * win32 ioctl specific
 *****************************************************************************/

--- a/include/bytes_swap.h
+++ b/include/bytes_swap.h
+/*****************************************************************************
+ * bytes_swap.h: fast routines to swap bytes order.
+ *****************************************************************************
+ * Copyright (C) 1998, 1999, 2000 VideoLAN
+ * $Id: bytes_swap.h,v 1.1 2001/11/25 22:52:21 gbazin Exp $
+ *
+ * Authors: This code was borrowed from the GNU C Library.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+/* Swap bytes in 16 bit value.  */
+#define __bswap_constant_16(x) \
+     ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
+#if defined __GNUC__ && __GNUC__ >= 2
+# define __bswap_16(x) \
+     (__extension__							      \
+      ({ register unsigned short int __v;				      \
+	 if (__builtin_constant_p (x))					      \
+	   __v = __bswap_constant_16 (x);				      \
+	 else								      \
+	   __asm__ __volatile__ ("rorw $8, %w0"				      \
+				 : "=r" (__v)				      \
+				 : "0" ((unsigned short int) (x))	      \
+				 : "cc");				      \
+	 __v; }))
+#else
+/* This is better than nothing.  */
+# define __bswap_16(x) __bswap_constant_16 (x)
+#endif
+/* Swap bytes in 32 bit value.  */
+#define __bswap_constant_32(x) \
+     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) |		      \
+      (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+#if defined __GNUC__ && __GNUC__ >= 2
+/* To swap the bytes in a word the i486 processors and up provide the
+   `bswap' opcode.  On i386 we have to use three instructions.  */
+# if !defined __i486__ && !defined __pentium__ && !defined __pentiumpro__
+#  define __bswap_32(x) \
+     (__extension__							      \
+      ({ register unsigned int __v;					      \
+	 if (__builtin_constant_p (x))					      \
+	   __v = __bswap_constant_32 (x);				      \
+	 else								      \
+	   __asm__ __volatile__ ("rorw $8, %w0;"			      \
+				 "rorl $16, %0;"			      \
+				 "rorw $8, %w0"				      \
+				 : "=r" (__v)				      \
+				 : "0" ((unsigned int) (x))		      \
+				 : "cc");				      \
+	 __v; }))
+# else
+#  define __bswap_32(x) \
+     (__extension__							      \
+      ({ register unsigned int __v;					      \
+	 if (__builtin_constant_p (x))					      \
+	   __v = __bswap_constant_32 (x);				      \
+	 else								      \
+	   __asm__ __volatile__ ("bswap %0"				      \
+				 : "=r" (__v)				      \
+				 : "0" ((unsigned int) (x)));		      \
+	 __v; }))
+# endif
+#else
+# define __bswap_32(x) __bswap_constant_32 (x)
+#endif
+#if defined __GNUC__ && __GNUC__ >= 2
+/* Swap bytes in 64 bit value.  */
+#define __bswap_constant_64(x) \
+     ((((x) & 0xff00000000000000ull) >> 56)				      \
+      | (((x) & 0x00ff000000000000ull) >> 40)				      \
+      | (((x) & 0x0000ff0000000000ull) >> 24)				      \
+      | (((x) & 0x000000ff00000000ull) >> 8)				      \
+      | (((x) & 0x00000000ff000000ull) << 8)				      \
+      | (((x) & 0x0000000000ff0000ull) << 24)				      \
+      | (((x) & 0x000000000000ff00ull) << 40)				      \
+      | (((x) & 0x00000000000000ffull) << 56))
+# define __bswap_64(x) \
+     (__extension__							      \
+      ({ union { __extension__ unsigned long long int __ll;		      \
+		 unsigned long int __l[2]; } __w, __r;			      \
+         if (__builtin_constant_p (x))					      \
+	   __r.__ll = __bswap_constant_64 (x);				      \
+	 else								      \
+	   {								      \
+	     __w.__ll = (x);						      \
+	     __r.__l[0] = __bswap_32 (__w.__l[1]);			      \
+	     __r.__l[1] = __bswap_32 (__w.__l[0]);			      \
+	   }								      \
+	 __r.__ll; }))
+#endif
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
 * Collection of useful common types and macros definitions
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.49 2001/11/21 10:47:20 massiot Exp $
+ * $Id: common.h,v 1.50 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Samuel Hocevar <sam@via.ecp.fr>
 *          Vincent Seguin <seguin@via.ecp.fr>
@@ -153,7 +153,7 @@ struct decoder_fifo_s;
 #ifdef NTOHL_IN_SYS_PARAM_H
 #   include <sys/param.h>
 #elif defined(WIN32)
-#   include <winsock.h>
+#   include "bytes_swap.h"
 #else
 #   include <netinet/in.h>
 #endif
@@ -220,44 +220,13 @@ struct decoder_fifo_s;
        /* Assume malloc alignment is sufficient */
 #       define memalign(align,size) malloc(size)
 #   endif    
+#endif
-#endif
+#define I64C(x)         x##LL
-/* win32, cl and icl support */
-#if defined( _MSC_VER )
-#   define __attribute__(x)
-#   define __inline__      __inline
-#   define strncasecmp     strnicmp
-#   define strcasecmp      stricmp
-#   define S_ISBLK(m)      (0)
-#   define S_ISCHR(m)      (0)
-#   define S_ISFIFO(m)     (((m)&_S_IFMT) == _S_IFIFO)
-#   define S_ISREG(m)      (((m)&_S_IFMT) == _S_IFREG)
-#   define I64C(x)         x##i64
-#else
-#   define I64C(x)         x##LL
-#endif
+/* The win32 specific stuff was getting really big so it has been moved */
 #if defined( WIN32 )
-#   if defined( __MINGW32__ )
+#   include "common_win32.h"
-#       if !defined( _OFF_T_ )
-typedef long long _off_t;
-typedef _off_t off_t;
-#           define _OFF_T_
-#       else
-#           define off_t long long
-#       endif
-#   elif defined( _MSC_VER )
-#       if !defined( _OFF_T_DEFINED )
-typedef __int64 off_t;
-#           define _OFF_T_DEFINED
-#       else
-#           define off_t __int64
-#       endif
-#   endif
-#   define stat _stati64
-#   ifndef snprintf
-#       define snprintf _snprintf  /* snprintf not defined in mingw32 (bug?) */
-#   endif
 #endif
--- a/include/common_win32.h
+++ b/include/common_win32.h
+/*****************************************************************************
+ * common_win32.h: common definitions specific to Win32
+ * Collection of useful common types and macros definitions
+ *****************************************************************************
+ * Copyright (C) 1998, 1999, 2000 VideoLAN
+ * $Id: common_win32.h,v 1.1 2001/11/25 22:52:21 gbazin Exp $
+ *
+ * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+/* The ntoh* and hton* bytes swapping functions are provided by winsock
+ * but for conveniency and speed reasons it is better to implement them
+ * ourselves. ( several plugins use them and it is too much assle to link
+ * winsock with each of them ;-)
+ */
+#undef ntoh32(x)
+#undef ntoh16(x)
+#undef ntoh64(x)
+#undef hton32(x)
+#undef hton16(x)
+#undef hton64(x)
+#ifdef WORDS_BIGENDIAN
+#   define ntoh32(x)       (x)
+#   define ntoh16(x)       (x)
+#   define ntoh64(x)       (x)
+#   define hton32(x)       (x)
+#   define hton16(x)       (x)
+#   define hton64(x)       (x)
+#else
+#   define ntoh32(x)     __bswap_32 (x)
+#   define ntoh16(x)     __bswap_16 (x)
+#   define ntoh64(x)     __bswap_32 (x)
+#   define hton32(x)     __bswap_32 (x)
+#   define hton16(x)     __bswap_16 (x)
+#   define hton64(x)     __bswap_32 (x)
+#endif
+/* win32, cl and icl support */
+#if defined( _MSC_VER )
+#   define __attribute__(x)
+#   define __inline__      __inline
+#   define strncasecmp     strnicmp
+#   define strcasecmp      stricmp
+#   define S_ISBLK(m)      (0)
+#   define S_ISCHR(m)      (0)
+#   define S_ISFIFO(m)     (((m)&_S_IFMT) == _S_IFIFO)
+#   define S_ISREG(m)      (((m)&_S_IFMT) == _S_IFREG)
+#   undef I64C(x)
+#   define I64C(x)         x##i64
+#endif
+/* several type definitions */
+#if defined( __MINGW32__ )
+#   if !defined( _OFF_T_ )
+typedef long long _off_t;
+typedef _off_t off_t;
+#       define _OFF_T_
+#   else
+#       define off_t long long
+#   endif
+#endif
+#if defined( _MSC_VER )
+#   if !defined( _OFF_T_DEFINED )
+typedef __int64 off_t;
+#       define _OFF_T_DEFINED
+#   else
+#       define off_t __int64
+#   endif
+#   define stat _stati64
+#endif
+#ifndef snprintf
+#   define snprintf _snprintf  /* snprintf not defined in mingw32 (bug?) */
+#endif
--- a/include/input_ext-intf.h
+++ b/include/input_ext-intf.h
@@ -4,7 +4,7 @@
 * control the pace of reading. 
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-intf.h,v 1.48 2001/11/15 17:39:12 sam Exp $
+ * $Id: input_ext-intf.h,v 1.49 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -321,6 +321,7 @@ typedef struct input_thread_s
 /*****************************************************************************
 * Prototypes
 *****************************************************************************/
+#ifndef PLUGIN
 struct input_thread_s * input_CreateThread ( struct playlist_item_s *,
                                             int *pi_status );
 void input_DestroyThread( struct input_thread_s *, int *pi_status );
@@ -337,4 +338,4 @@ int  input_ChangeArea( struct input_thread_s *, struct input_area_s * );
 int  input_ToggleGrayscale( struct input_thread_s * );
 int  input_ToggleMute( struct input_thread_s * );
 int  input_SetSMP( struct input_thread_s *, int );
+#endif
--- a/include/input_ext-plugins.h
+++ b/include/input_ext-plugins.h
@@ -3,7 +3,7 @@
 *                      but exported to plug-ins
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: input_ext-plugins.h,v 1.5 2001/11/15 17:39:12 sam Exp $
+ * $Id: input_ext-plugins.h,v 1.6 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -40,15 +40,18 @@
 /*****************************************************************************
 * Prototypes from input_ext-dec.c
 *****************************************************************************/
+#ifndef PLUGIN
 void InitBitstream  ( struct bit_stream_s *, struct decoder_fifo_s *,
                      void (* pf_bitstream_callback)( struct bit_stream_s *,
                                                      boolean_t ),
                      void * p_callback_arg );
 void NextDataPacket ( struct bit_stream_s * );
+#endif
 /*****************************************************************************
 * Prototypes from input_programs.c
 *****************************************************************************/
+#ifndef PLUGIN
 int  input_InitStream( struct input_thread_s *, size_t );
 void input_EndStream ( struct input_thread_s * );
 struct pgrm_descriptor_s * input_FindProgram( struct input_thread_s *, u16 );
@@ -64,10 +67,12 @@ struct es_descriptor_s * input_AddES ( struct input_thread_s *,
 void input_DelES     ( struct input_thread_s *, struct es_descriptor_s * );
 int  input_SelectES  ( struct input_thread_s *, struct es_descriptor_s * );
 int  input_UnselectES( struct input_thread_s *, struct es_descriptor_s * );
+#endif
 /*****************************************************************************
 * Prototypes from input_dec.c
 *****************************************************************************/
+#ifndef PLUGIN
 //decoder_capabilities_s * input_ProbeDecoder( void );
 vlc_thread_t input_RunDecoder( struct input_thread_s *,
                               struct es_descriptor_s * );
@@ -76,10 +81,12 @@ void input_DecodePES ( struct decoder_fifo_s *, struct pes_packet_s * );
 void input_EscapeDiscontinuity( struct input_thread_s *,
                                struct pgrm_descriptor_s * );
 void input_EscapeAudioDiscontinuity( struct input_thread_s * );
+#endif
 /*****************************************************************************
 * Prototypes from input_clock.c
 *****************************************************************************/
+#ifndef PLUGIN
 void input_ClockInit( struct pgrm_descriptor_s * );
 int  input_ClockManageControl( struct input_thread_s *,
                               struct pgrm_descriptor_s *, mtime_t );
@@ -87,6 +94,7 @@ void input_ClockManageRef( struct input_thread_s *,
                           struct pgrm_descriptor_s *, mtime_t );
 mtime_t input_ClockGetTS( struct input_thread_s *,
                          struct pgrm_descriptor_s *, mtime_t );
+#endif
 /*****************************************************************************
 * Create a NULL packet for padding in case of a data loss
@@ -176,6 +184,7 @@ typedef struct netlist_s
 /*****************************************************************************
 * Prototypes
 *****************************************************************************/
+#ifndef PLUGIN
 int                     input_NetlistInit( struct input_thread_s *,
                                           int i_nb_iovec,
                                           int i_nb_data,
@@ -194,6 +203,7 @@ void                    input_NetlistDeletePacket( void *,
 void                    input_NetlistDeletePES( void *,
                                                struct pes_packet_s * );
 void                    input_NetlistEnd( struct input_thread_s * );
+#endif
 /*
@@ -293,6 +303,7 @@ typedef struct stream_ps_data_s
 /*****************************************************************************
 * Prototypes
 *****************************************************************************/
+#ifndef PLUGIN
 void input_ParsePES  ( struct input_thread_s *, struct es_descriptor_s * );
 void input_GatherPES ( struct input_thread_s *, struct data_packet_s *,
                       struct es_descriptor_s *, boolean_t, boolean_t );
@@ -302,4 +313,4 @@ void input_DemuxPS   ( struct input_thread_s *, struct data_packet_s * );
 void input_DemuxTS   ( struct input_thread_s *, struct data_packet_s * );
 void input_DemuxPSI  ( struct input_thread_s *, struct data_packet_s *,
                       struct es_descriptor_s *, boolean_t, boolean_t );
+#endif
--- a/include/modules_export.h
+++ b/include/modules_export.h
@@ -158,11 +158,12 @@ typedef struct module_symbols_s
    void  ( * vout_DatePicture )    ( struct vout_thread_s *p_vout, 
                                      struct picture_s *p_pic, mtime_t );
    u32  ( * UnalignedShowBits )    ( struct bit_stream_s *, unsigned int );
    void ( * UnalignedRemoveBits )  ( struct bit_stream_s * );
    u32  ( * UnalignedGetBits )     ( struct bit_stream_s *, unsigned int );
+    char * ( * DecodeLanguage ) ( u16 );
    struct module_s * ( * module_Need )    ( int, void * );
    void ( * module_Unneed )        ( struct module_s * );
 } module_symbols_t;
@@ -247,6 +248,7 @@ typedef struct module_symbols_s
    (p_symbols)->UnalignedGetBits = UnalignedGetBits; \
    (p_symbols)->UnalignedRemoveBits = UnalignedRemoveBits; \
    (p_symbols)->UnalignedShowBits = UnalignedShowBits; \
+    (p_symbols)->DecodeLanguage = DecodeLanguage; \
    (p_symbols)->module_Need = module_Need; \
    (p_symbols)->module_Unneed = module_Unneed;
@@ -338,6 +340,7 @@ extern module_symbols_t* p_symbols;
 #   define input_NetlistGetiovec p_symbols->input_NetlistGetiovec
 #   define input_NetlistMviovec p_symbols->input_NetlistMviovec
 #   define input_NetlistNewPacket p_symbols->input_NetlistNewPacket
+#   define input_NetlistNewPtr p_symbols->input_NetlistNewPtr
 #   define input_NetlistNewPES p_symbols->input_NetlistNewPES
 #   define input_NetlistDeletePacket p_symbols->input_NetlistDeletePacket
 #   define input_NetlistDeletePES p_symbols->input_NetlistDeletePES
@@ -360,6 +363,9 @@ extern module_symbols_t* p_symbols;
 #   define UnalignedShowBits p_symbols->UnalignedShowBits
 #   define UnalignedRemoveBits p_symbols->UnalignedRemoveBits
 #   define UnalignedGetBits p_symbols->UnalignedGetBits
+#   define DecodeLanguage p_symbols->DecodeLanguage
 #   define module_Need p_symbols->module_Need
 #   define module_Unneed p_symbols->module_Unneed

--- a/include/threads.h
+++ b/include/threads.h
@@ -3,7 +3,7 @@
 * This header provides a portable threads implementation.
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: threads.h,v 1.26 2001/11/14 00:01:36 jlj Exp $
+ * $Id: threads.h,v 1.27 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
 *          Samuel Hocevar <sam@via.ecp.fr>
@@ -48,6 +48,7 @@ int pthread_mutexattr_setkind_np( pthread_mutexattr_t *attr, int kind );
 #   include <byteorder.h>
 #elif defined( WIN32 )
+#define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
 #   include <process.h>

--- a/plugins/ac3_adec/ac3_bit_allocate.c
+++ b/plugins/ac3_adec/ac3_bit_allocate.c
@@ -2,7 +2,7 @@
 * ac3_bit_allocate.c: ac3 allocation tables
 *****************************************************************************
 * Copyright (C) 2000 VideoLAN
- * $Id: ac3_bit_allocate.c,v 1.1 2001/11/13 12:09:17 henri Exp $
+ * $Id: ac3_bit_allocate.c,v 1.2 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Michel Kaempf <maxx@via.ecp.fr>
 *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -35,6 +35,9 @@
 #include "threads.h"
 #include "mtime.h"
+#include "modules.h"
+#include "modules_export.h"
 #include "stream_control.h"
 #include "input_ext-dec.h"

--- a/plugins/ac3_adec/ac3_decoder.c
+++ b/plugins/ac3_adec/ac3_decoder.c
@@ -2,7 +2,7 @@
 * ac3_decoder.c: core ac3 decoder
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_decoder.c,v 1.1 2001/11/13 12:09:17 henri Exp $
+ * $Id: ac3_decoder.c,v 1.2 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Michel Kaempf <maxx@via.ecp.fr>
 *          Michel Lespinasse <walken@zoy.org>
@@ -38,6 +38,7 @@
 #include "audio_output.h"
+#include "modules.h"
 #include "modules_export.h"
 #include "stream_control.h"

--- a/plugins/ac3_adec/ac3_exponent.c
+++ b/plugins/ac3_adec/ac3_exponent.c
@@ -2,7 +2,7 @@
 * ac3_exponent.c: ac3 exponent calculations
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_exponent.c,v 1.1 2001/11/13 12:09:17 henri Exp $
+ * $Id: ac3_exponent.c,v 1.2 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Michel Kaempf <maxx@via.ecp.fr>
 *          Michel Lespinasse <walken@zoy.org>
@@ -38,6 +38,7 @@
 #include "audio_output.h"
+#include "modules.h"
 #include "modules_export.h"
 #include "stream_control.h"

--- a/plugins/ac3_adec/ac3_imdct.c
+++ b/plugins/ac3_adec/ac3_imdct.c
@@ -2,7 +2,7 @@
 * ac3_imdct.c: ac3 DCT
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_imdct.c,v 1.2 2001/11/13 18:10:38 sam Exp $
+ * $Id: ac3_imdct.c,v 1.3 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Michel Kaempf <maxx@via.ecp.fr>
 *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -38,6 +38,9 @@
 #include "threads.h"
 #include "mtime.h"
+#include "modules.h"
+#include "modules_export.h"
 #include "stream_control.h"
 #include "input_ext-dec.h"

--- a/plugins/ac3_adec/ac3_mantissa.c
+++ b/plugins/ac3_adec/ac3_mantissa.c
@@ -2,7 +2,7 @@
 * ac3_mantissa.c: ac3 mantissa computation
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: ac3_mantissa.c,v 1.1 2001/11/13 12:09:17 henri Exp $
+ * $Id: ac3_mantissa.c,v 1.2 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Michel Kaempf <maxx@via.ecp.fr>
 *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -38,6 +38,7 @@
 #include "audio_output.h"
+#include "modules.h"
 #include "modules_export.h"
 #include "stream_control.h"

--- a/plugins/ac3_adec/ac3_parse.c
+++ b/plugins/ac3_adec/ac3_parse.c
@@ -2,7 +2,7 @@
 * ac3_parse.c: ac3 parsing procedures
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: ac3_parse.c,v 1.1 2001/11/13 12:09:17 henri Exp $
+ * $Id: ac3_parse.c,v 1.2 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Michel Kaempf <maxx@via.ecp.fr>
 *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -39,6 +39,7 @@
 #include "audio_output.h"
+#include "modules.h"
 #include "modules_export.h"
 #include "stream_control.h"

--- a/plugins/ac3_adec/ac3_rematrix.c
+++ b/plugins/ac3_adec/ac3_rematrix.c
@@ -2,7 +2,7 @@
 * ac3_rematrix.c: ac3 audio rematrixing
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_rematrix.c,v 1.1 2001/11/13 12:09:17 henri Exp $
+ * $Id: ac3_rematrix.c,v 1.2 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Michel Kaempf <maxx@via.ecp.fr>
 *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -34,6 +34,9 @@
 #include "threads.h"
 #include "mtime.h"
+#include "modules.h"
+#include "modules_export.h"
 #include "stream_control.h"
 #include "input_ext-dec.h"

--- a/plugins/downmix/ac3_downmix_3dn.c
+++ b/plugins/downmix/ac3_downmix_3dn.c
@@ -2,7 +2,7 @@
 * ac3_downmix_3dn.c: accelerated 3D Now! ac3 downmix functions
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: ac3_downmix_3dn.c,v 1.4 2001/07/08 23:15:11 reno Exp $
+ * $Id: ac3_downmix_3dn.c,v 1.5 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Renaud Dartus <reno@videolan.org>
 *
@@ -37,11 +37,7 @@
 #include "ac3_downmix.h"
-void sqrt2_3dn (void) __asm__ ("sqrt2_3dn");
+static const float sqrt2_3dn __asm__ ("sqrt2_3dn") = 0.7071068;
-void sqrt2_3dn (void)
-{
-    __asm__ (".float 0f0.7071068");
-}
 void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
 {

--- a/plugins/downmix/ac3_downmix_sse.c
+++ b/plugins/downmix/ac3_downmix_sse.c
@@ -2,7 +2,7 @@
 * ac3_downmix_sse.c: accelerated SSE ac3 downmix functions
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: ac3_downmix_sse.c,v 1.4 2001/07/08 23:15:11 reno Exp $
+ * $Id: ac3_downmix_sse.c,v 1.5 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Renaud Dartus <reno@videolan.org>
 *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -38,12 +38,7 @@
 #include "ac3_downmix.h"
-void sqrt2_sse (void) __asm__ ("sqrt2_sse");
+static const float sqrt2_sse __asm__ ("sqrt2_sse") __attribute__ ((aligned (16))) = 0.7071068;
-void sqrt2_sse (void)
-{
-    __asm__ (".align 16\n"
-             ".float 0f0.7071068");
-}
 void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
 {

--- a/plugins/dummy/input_dummy.c
+++ b/plugins/dummy/input_dummy.c
@@ -2,7 +2,7 @@
 * input_dummy.c: dummy input plugin, to manage "vlc:***" special options
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: input_dummy.c,v 1.6 2001/11/07 22:58:13 jlj Exp $
+ * $Id: input_dummy.c,v 1.7 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *
@@ -50,14 +50,14 @@
 #include "main.h"
+#include "modules.h"
+#include "modules_export.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"
 #include "input_ext-plugins.h"
-#include "modules.h"
-#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes
 *****************************************************************************/

--- a/plugins/dvd/input_dvd.c
+++ b/plugins/dvd/input_dvd.c
@@ -10,7 +10,7 @@
 *  -dvd_udf to find files
 *****************************************************************************
 * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.98 2001/11/19 15:13:11 stef Exp $
+ * $Id: input_dvd.c,v 1.99 2001/11/25 22:52:21 gbazin Exp $
 *
 * Author: Stphane Borel <stef@via.ecp.fr>
 *
@@ -80,6 +80,9 @@
 #include "main.h"
+#include "modules.h"
+#include "modules_export.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"
@@ -91,9 +94,6 @@
 #include "debug.h"
-#include "modules.h"
-#include "modules_export.h"
 /* how many blocks DVDRead will read in each loop */
 #define DVD_BLOCK_READ_ONCE 64
 #define DVD_DATA_READ_ONCE  (4 * DVD_BLOCK_READ_ONCE)

--- a/plugins/mpeg/input_es.c
+++ b/plugins/mpeg/input_es.c
@@ -2,7 +2,7 @@
 * input_es.c: Elementary Stream demux and packet management
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: input_es.c,v 1.12 2001/11/11 01:32:03 stef Exp $
+ * $Id: input_es.c,v 1.13 2001/11/25 22:52:21 gbazin Exp $
 *
 * Author: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -62,6 +62,9 @@
 #include "main.h"
+#include "modules.h"
+#include "modules_export.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"
@@ -71,9 +74,6 @@
 #include "debug.h"
-#include "modules.h"
-#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes
 *****************************************************************************/

--- a/plugins/mpeg/input_ps.c
+++ b/plugins/mpeg/input_ps.c
@@ -2,7 +2,7 @@
 * input_ps.c: PS demux and packet management
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ps.c,v 1.37 2001/10/03 14:41:08 massiot Exp $
+ * $Id: input_ps.c,v 1.38 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *          Cyril Deguet <asmax@via.ecp.fr>
@@ -60,6 +60,9 @@
 #include "main.h"
+#include "modules.h"
+#include "modules_export.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"
@@ -69,9 +72,6 @@
 #include "debug.h"
-#include "modules.h"
-#include "modules_export.h"
 /*****************************************************************************
 * fseeko: fseeko replacement for BSDI.
 *****************************************************************************/

--- a/plugins/mpeg/input_ts.c
+++ b/plugins/mpeg/input_ts.c
@@ -2,7 +2,7 @@
 * input_ts.c: TS demux and netlist management
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ts.c,v 1.37 2001/11/23 18:47:51 massiot Exp $
+ * $Id: input_ts.c,v 1.38 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Henri Fallon <henri@videolan.org>
 *
@@ -74,6 +74,9 @@
 #include "intf_msg.h"
+#include "modules.h"
+#include "modules_export.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"
@@ -81,9 +84,6 @@
 #include "input_ts.h"
-#include "modules.h"
-#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes
 *****************************************************************************/

--- a/plugins/text/Makefile
+++ b/plugins/text/Makefile
@@ -34,7 +34,7 @@ include ../../Makefile.modules
 	$(RANLIB) $@
 ../rc.so: $(PLUGIN_RC)
-	$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
+	$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_RC)
 ../rc.a: $(BUILTIN_RC)
 	ar r $@ $^

--- a/plugins/text/intf_rc.c
+++ b/plugins/text/intf_rc.c
@@ -38,6 +38,10 @@
 #include <sys/time.h>
 #include <sys/types.h>
+#if defined( WIN32 )
+#include <winsock2.h>                                            /* select() */
+#endif
 #include "config.h"
 #include "common.h"
 #include "threads.h"

--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
 * modules.c : Built-in and plugin modules management functions
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.41 2001/10/02 16:46:59 massiot Exp $
+ * $Id: modules.c,v 1.42 2001/11/25 22:52:21 gbazin Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -80,6 +80,8 @@
 #include "audio_output.h"
+#include "iso_lang.h"
 #ifdef HAVE_DYNAMIC_PLUGINS
 #   include "modules_core.h"
 #endif