* ./configure.ac.in: removed the --with-bcbuilder flag.

  * ./INSTALL.win32: updated accordingly.

INSTALL.win32

@@ -160,18 +160,13 @@ Building Win32 interface with bcc32 (Borland's compiler)
 (This stage is only necessary if you want to use the Win32 native interface.
  If you are happy with the GTK interface, then you can skip this section)
 
-1) Compile vlc as usual.
+1) Install Borland C++ Builder, you will need bpr2mak and make.
 
-2) From the plugin\win32 directory, use Borland C++ command-line tools
-as follows:
-bpr2mak intfwin.bpr -s \
-  | sed 's#^LIBPATH = .*#&;$$(RELEASELIBPATH)# ; s#^USERDEFINES = .*#& -DWIN32 -D__PLUGIN__ -DMODULE_NAME_IS_intfwin -DMODULE_NAME=intfwin#' \
-  > intfwin.mak	        // Create a makefile from intfwin.bpr
-make -fintfwin 		// It's Borland's make utility !
-
-3) This should create a intfwin.so
-You can remove any other generated file.
+2) Make sure you have the bpr2mak and bcmake (NOT make!) commands in $PATH,
+they can be symlinks to the Borland bpr2mak and make utilities, or wrappers
+that call them through Wine if you are cross-compiling from Linux.
 
+3) Configure vlc as usual with the --enable-intfwin flag and build it.
 
 Well done, now you're ready to use vlc!
 =======================================

configure.ac.in

@@ -33,7 +33,8 @@ AC_PROG_CXX
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
-dnl AC_PROG_EGREP only exists in autoconf 2.54+
+dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
+dnl now otherwise it might be set in an obscure if statement.
 AC_EGREP_CPP(foo,foo)
 
 dnl AC_PROG_OBJC doesn't seem to exist, this is the KDE workaround
@@ -2465,12 +2466,8 @@ AC_ARG_ENABLE(intfwin,
 [  --enable-intfwin        Win32 interface support (default disabled)],
 [ if test "x${enable_intfwin}" != "xno"
   then
-    AC_ARG_WITH(bcbuilder,
-    [    --with-bcbuilder=PATH Borland C++ Builder installation path])
-    if test "x${with_bcbuilder}" != "x"
-    then
-      BCBUILDER="${with_bcbuilder}"
-    fi
+    AC_CHECK_TOOL(BPR2MAK, bpr2mak, AC_ERROR(bpr2mak not found))
+    AC_CHECK_TOOL(BCMAKE, bcmake, AC_ERROR(bcmake not found))
     PLUGINS="${PLUGINS} win32"
   fi ])
 
@@ -2847,7 +2844,6 @@ AC_SUBST(ALIASES)
 AC_SUBST(ASM)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
-AC_SUBST(BCBUILDER)
 AC_SUBST(XPIDL)
 AC_SUBST(LIBEXT)
 AC_SUBST(INCLUDES)

modules/gui/win32/Modules.am

@@ -11,11 +11,11 @@ SOURCES_win32 = PRIVATE
 modules/gui/win32/libwin32_plugin.dll: $(BORLAND_win32)
 	cd modules/gui/win32/ && \
 	rm -f win32.mak && \
-	$(BCBUILDER)/Bin/bpr2mak win32.bpr -s | \
+	$(BPR2MAK) win32.bpr -s | \
 		sed -e 's@^LIBPATH = .*@&;$$(RELEASELIBPATH)@' \
 		    -e 's@^USERDEFINES = .*@& -DMODULE_NAME=win32@' \
 		> win32.mak && \
-	$(BCBUILDER)/Bin/make -f win32.mak -b
+	$(BCMAKE) -f win32.mak -b
 
 BORLAND_win32 = \
 	modules/gui/win32/win32.bpr \

modules/gui/win32/menu.cpp

@@ -2,7 +2,7 @@
  * menu.cpp: functions to handle menu items
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: menu.cpp,v 1.8 2003/01/23 03:33:34 ipkiss Exp $
+ * $Id: menu.cpp,v 1.9 2003/01/24 12:01:03 sam Exp $
  *
  * Authors: Olivier Teuliere <ipkiss@via.ecp.fr>
  *
@@ -170,7 +170,7 @@ void __fastcall TMenusGen::MenuTitleClick( TObject *Sender )
     TMenuItem     * Item = (TMenuItem *)Sender;
     TMenuItem     * ItemTitle;
     input_area_t  * p_area;
-    int             i_title = Item->Tag;
+    unsigned int    i_title = Item->Tag;
 
     vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
     i_title = __MIN( i_title,
@@ -197,8 +197,8 @@ void __fastcall TMenusGen::MenuChapterClick( TObject *Sender )
     TMenuItem     * Item = (TMenuItem *)Sender;
     TMenuItem     * ItemTitle;
     input_area_t  * p_area;
-    int             i_title;
-    int             i_chapter = Item->Tag;
+    unsigned int    i_title;
+    unsigned int    i_chapter = Item->Tag;
 
     vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
     p_area = p_intf->p_sys->p_input->stream.p_selected_area;
@@ -228,8 +228,8 @@ void __fastcall TMenusGen::PopupNavigationClick( TObject *Sender )
     TMenuItem     * Item = (TMenuItem *)Sender;
     TMenuItem     * ItemTitle;
     input_area_t  * p_area;
-    int             i_title   = Data2Title( Item->Tag );
-    int             i_chapter = Data2Chapter( Item->Tag );
+    unsigned int    i_title   = Data2Title( Item->Tag );
+    unsigned int    i_chapter = Data2Chapter( Item->Tag );
 
     vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
     i_title = __MIN( i_title,

modules/gui/win32/win32.cpp

@@ -2,7 +2,7 @@
  * win32.cpp : Win32 interface plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: win32.cpp,v 1.11 2003/01/23 03:33:34 ipkiss Exp $
+ * $Id: win32.cpp,v 1.12 2003/01/24 12:01:03 sam Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *
@@ -172,7 +172,7 @@ int Win32Manage( intf_thread_t *p_intf )
 
     if( p_intf->p_sys->p_input != NULL && !p_intf->p_sys->p_input->b_die )
     {
-        vlc_bool_t b_need_menus = 0;
+        vlc_bool_t b_need_menus = VLC_FALSE;
         input_thread_t  * p_input = p_intf->p_sys->p_input;
         aout_instance_t * p_aout = NULL;
         vout_thread_t   * p_vout = NULL;
@@ -183,7 +183,7 @@ int Win32Manage( intf_thread_t *p_intf )
         if( p_input->stream.b_changed )
         {
             p_intf->p_sys->p_window->ModeManage();
-            b_need_menus = 1;
+            b_need_menus = VLC_TRUE;
             p_intf->p_sys->b_playing = 1;
         }
 
@@ -225,7 +225,7 @@ int Win32Manage( intf_thread_t *p_intf )
         if( p_intf->p_sys->i_part != p_input->stream.p_selected_area->i_part )
         {
             p_intf->p_sys->b_chapter_update = 1;
-            b_need_menus = 1;
+            b_need_menus = VLC_TRUE;
         }
 
         /* Does the audio output require to update the menus ? */
@@ -238,7 +238,7 @@ int Win32Manage( intf_thread_t *p_intf )
                 && val.b_bool )
             {
                 p_intf->p_sys->b_aout_update = 1;
-                b_need_menus = 1;
+                b_need_menus = VLC_TRUE;
             }
 
             vlc_object_release( (vlc_object_t *)p_aout );
@@ -254,14 +254,16 @@ int Win32Manage( intf_thread_t *p_intf )
                 && val.b_bool )
             {
                 p_intf->p_sys->b_vout_update = 1;
-                b_need_menus = 1;
+                b_need_menus = VLC_TRUE;
             }
 
             vlc_object_release( (vlc_object_t *)p_vout );
         }
 
-//        if( b_need_menus )
-//            p_intf->p_sys->p_menus->SetupMenus();
+        if( b_need_menus )
+        {
+            //p_intf->p_sys->p_menus->SetupMenus();
+        }
 
         vlc_mutex_unlock( &p_input->stream.stream_lock );
     }