* Got rid of the DVD_DEVICE macro. We now use the dvd_device config option.
  ( this creates a small memory leak as we don't free the string obtained
    from config_GetPszVariable, but I think we can live with it for now )

* the SSE plugins are disable on the mingw32 build as they don't work.
  ( because memalign is not implemented on win32, and malloc only aligns
    on an 8 bytes boundary )

* fixed small mistake in INSTALL.win32

INSTALL.win32

@@ -76,6 +76,7 @@ along those lines:
 
   make distclean ; \
   ./configure --host=i586-mingw32msvc --target=i586-mingw32msvc \
+  --build=i386-linux \
   --with-gtk-config-path=/usr/local/gtk-win32/bin \
   --with-sdl-config-path=/usr/local/SDL-1.2.3-win32/i386-mingw32msvc/bin \
   --with-directx=/usr/local/dxheaders
@@ -86,6 +87,7 @@ www.videolan.org, you have to use something along those lines:
   CC=/usr/local/cross-tools/bin/i586-mingw32msvc-gcc \
   PATH=/usr/local/cross-tools/bin:$PATH \
   ./configure --host=i586-mingw32msvc --target=i586-mingw32msvc \
+  --build=i386-linux \
   --with-gtk-config-path=/usr/local/gtk-win32/bin \
   --with-sdl-config-path=/usr/local/SDL-1.2.3-win32/i386-mingw32msvc/bin \
   --with-directx=/usr/local/dxheaders

configure.in

@@ -421,7 +421,9 @@ dnl
 MMX_MODULES="memcpymmx idctmmx motionmmx chroma_i420_rgb_mmx chroma_i420_yuy2_mmx chroma_i422_yuy2_mmx chroma_i420_ymga_mmx"
 MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
 THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
+if test x$SYS != xmingw32; then
 SSE_MODULES="imdctsse downmixsse"
+fi
 ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec"
 
 AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
@@ -518,23 +520,6 @@ if test x"$ac_cv_ld_altivec" != x"no"; then
 fi
 fi # end if mingw32
 
-dnl
-dnl  DVD and VCD devices
-dnl
-case x$SYS in
-  xmingw32)
-    DVD_DEVICE="E:"
-    VCD_DEVICE="E:"
-    ;;
-  *)
-    DVD_DEVICE="/dev/dvd"
-    VCD_DEVICE="/dev/cdrom"
-    ;;
-esac
-
-AC_DEFINE_UNQUOTED(DVD_DEVICE, "$DVD_DEVICE")
-AC_DEFINE_UNQUOTED(VCD_DEVICE, "$VCD_DEVICE")
-
 
 dnl
 dnl  libdvdcss: check for DVD ioctls
@@ -1596,8 +1581,6 @@ AC_SUBST(WINDRES)
 AC_SUBST(DLL_PATH)
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
-AC_SUBST(VCD_DEVICE)
-AC_SUBST(DVD_DEVICE)
 
 AC_SUBST(LDFLAGS)
 AC_SUBST(PLDFLAGS)

extras/Win32_msvc/defs.h

@@ -49,8 +49,6 @@
 
 #define PACKAGE "vlc"
 #define VERSION "0.2.92-dev"
-#define DVD_DEVICE "E:"
-#define VCD_DEVICE "E:"
 #define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.2.92-dev_2002-03-22 Ourumov - (c) 1996-2002 VideoLAN"
 #define MODULE_SUFFIX "__MODULE_0_2_92_dev_2002_03_22"
 #define MODULE_SYMBOL 0_2_92_dev_2002_03_22

plugins/gtk/fixfiles.sh

@@ -14,7 +14,7 @@ do
 #include <videolan/vlc.h>
 EOF
                 tail +8 $file \
-                        | sed 's#_("/dev/dvd")#DVD_DEVICE#' \
+                        | sed 's#_("/dev/dvd")#config_GetPszVariable( "dvd_device" )#' \
                         >> /tmp/$$.$file.bak
                 mv -f /tmp/$$.$file.bak $file
         fi

plugins/gtk/gnome_interface.c

@@ -1382,7 +1382,7 @@ create_intf_disc (void)
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (disc_name);
   gtk_box_pack_start (GTK_BOX (hbox1), disc_name, TRUE, TRUE, 0);
-  gtk_entry_set_text (GTK_ENTRY (disc_name), DVD_DEVICE);
+  gtk_entry_set_text (GTK_ENTRY (disc_name), config_GetPszVariable( "dvd_device" ));
 
   dialog_action_area4 = GNOME_DIALOG (intf_disc)->action_area;
   gtk_object_set_data (GTK_OBJECT (intf_disc), "dialog_action_area4", dialog_action_area4);
@@ -2314,7 +2314,7 @@ create_intf_open (void)
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (entry1);
   gtk_box_pack_start (GTK_BOX (hbox6), entry1, TRUE, TRUE, 0);
-  gtk_entry_set_text (GTK_ENTRY (entry1), DVD_DEVICE);
+  gtk_entry_set_text (GTK_ENTRY (entry1), config_GetPszVariable( "dvd_device" ));
 
   tab_disc = gtk_label_new (_("Disc"));
   gtk_widget_ref (tab_disc);

plugins/gtk/gtk_interface.c

@@ -1593,7 +1593,7 @@ create_intf_disc (void)
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (disc_name);
   gtk_box_pack_start (GTK_BOX (hbox2), disc_name, TRUE, TRUE, 0);
-  gtk_entry_set_text (GTK_ENTRY (disc_name), DVD_DEVICE);
+  gtk_entry_set_text (GTK_ENTRY (disc_name), config_GetPszVariable( "dvd_device" ));
 
   dialog_action_area1 = GTK_DIALOG (intf_disc)->action_area;
   gtk_object_set_data (GTK_OBJECT (intf_disc), "dialog_action_area1", dialog_action_area1);