* ./plugins/win32/intfwin.bpr: we now build intfwin.so at the right place.
  * ./plugins/win32/Makefile: intfwin.so can be built using commandline.
  * ./configure.in, ./include/threads.h, ./include/common.h: a custom defs.h
    file isn't needed for the intfwin plugin anymore.
  * ./INSTALL.win32: updated compilation instructions for the intfwin plugin.

ChangeLog

@@ -4,6 +4,11 @@
 
 HEAD
 
+  * ./plugins/win32/intfwin.bpr: we now build intfwin.so at the right place.
+  * ./plugins/win32/Makefile: intfwin.so can be built using commandline.
+  * ./configure.in, ./include/threads.h, ./include/common.h: a custom defs.h
+    file isn't needed for the intfwin plugin anymore.
+  * ./INSTALL.win32: updated compilation instructions for the intfwin plugin.
   * ./AUTHORS: added ipkiss.
   * ./plugins/win32/mainframe.cpp: disabled the "hide interface" menu
     item, not yet implemented.

INSTALL.win32

@@ -128,22 +128,14 @@ Building Win32 interface with bcc32 (Borland's compiler)
 1) Compile vlc as usual.
 include\defs.h should be generated.
 
-2) Edit include\defs.h, and add the following lines if necessary:
-#define WIN32
-#define MODULE_NAME win32
-#define MODULE_NAME_IS win32
-#define PLUGIN
-#define HAVE_DYNAMIC_PLUGINS
-
-3) Still in defs.h, comment the following line to avoid compilation warnings:
-#define PACKAGE "vlc"
-
-4) From the plugin\win32 directory, use Borland C++ command-line tools
+2) From the plugin\win32 directory, use Borland C++ command-line tools
 as follows:
-bpr2mak intfwin.bpr 	// Create a makefile from intfwin.bpr
+bpr2mak intfwin.bpr -s \
+  | sed 's#^LIBPATH = .*#&;$$(RELEASELIBPATH)# ; s#^USERDEFINES = .*#& -DWIN32 -DPLUGIN -DMODULE_NAME_IS_intfwin -DMODULE_NAME=intfwin#' \
+  > intfwin.mak	        // Create a makefile from intfwin.bpr
 make -fintfwin 		// It's Borland's make utility !
 
-5) This should create a intfwin.so
+3) This should create a intfwin.so
 You can remove any other generated file.
 
 

Makefile

@@ -142,7 +142,7 @@ PLUGINS_TARGETS := a52/a52 \
 		text/rc \
 		vcd/vcd \
 		win32/waveout \
-		win32/win32 \
+		win32/intfwin \
 		x11/x11 \
 		x11/xvideo
 

Makefile.modules

@@ -73,9 +73,15 @@ $(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): .dep/%.dpp
 $(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.cpp
 	$(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@
 
+# foo_CUSTOM lets us override all target rules for foo.so and foo.a
+ifeq (,$($(module_name)_CUSTOM))
 ../$(module_name).so: $(EXTRA_DEP) $(OBJ_ALL)
-	$(CC) $(OBJ_ALL) $(PLDFLAGS) $(LIB_$(MODULE_NAME)) $(LIB_COMMON) -o $@ && chmod a-x $@
+	$(CC) $(OBJ_ALL) $(PLDFLAGS) $(LIB_$(MODULE_NAME)) $(LIB_COMMON) -o $@
+	chmod a-x $@
 
 ../$(module_name).a: $(EXTRA_DEP) $(OBJ_ALL)
-	rm -f $@ && ar rc $@ $(OBJ_ALL) && $(RANLIB) $@
+	rm -f $@
+	ar rc $@ $(OBJ_ALL)
+	$(RANLIB) $@
+endif
 

configure

@@ -1227,11 +1227,11 @@ fi
 ALL_LINGUAS="de fr ja no ru nl"
 
 cat >> confdefs.h <<EOF
-#define PACKAGE "vlc"
+#define VLC_PACKAGE "vlc"
 EOF
 
 cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
+#define VLC_VERSION "$VERSION"
 EOF
 
 # Extract the first word of "ranlib", so it can be a program name with args.
@@ -8222,8 +8222,8 @@ s%@TUNING@%$TUNING%g
 s%@RELEASE@%$RELEASE%g
 s%@MOC@%$MOC%g
 s%@DLL_PATH@%$DLL_PATH%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
+s%@VLC_PACKAGE@%$VLC_PACKAGE%g
+s%@VLC_VERSION@%$VLC_VERSION%g
 s%@PLDFLAGS@%$PLDFLAGS%g
 s%@LIB_COMMON@%$LIB_COMMON%g
 s%@LIB_VLC@%$LIB_VLC%g

configure.in

@@ -39,8 +39,8 @@ fi
 dnl Gettext stuff
 ALL_LINGUAS="de fr ja no ru nl"
 
-AC_DEFINE_UNQUOTED(PACKAGE, "vlc", [Package name])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Package version])
+AC_DEFINE_UNQUOTED(VLC_PACKAGE, "vlc", [Package name])
+AC_DEFINE_UNQUOTED(VLC_VERSION, "$VERSION", [Package version])
 AM_GNU_GETTEXT
 
 dnl AM_PROG_LIBTOOL
@@ -1420,8 +1420,8 @@ AC_SUBST(RELEASE)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
 AC_SUBST(DLL_PATH)
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+AC_SUBST(VLC_PACKAGE)
+AC_SUBST(VLC_VERSION)
 
 AC_SUBST(LDFLAGS)
 AC_SUBST(PLDFLAGS)

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.92 2002/04/05 01:05:22 gbazin Exp $
+ * $Id: common.h,v 1.93 2002/04/05 03:27:27 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -476,7 +476,12 @@ typedef __int64 off_t;
 /*****************************************************************************
  * I18n stuff
  *****************************************************************************/
-#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT )
+#ifndef PACKAGE
+#define PACKAGE VLC_PACKAGE
+#endif
+#define VERSION VLC_VERSION
+
+#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ )
 #   include <libintl.h>
 #else
 #   define _(String) (String)

plugins/win32/Makefile

-win32_SRC = win32.cpp
+#
+# Waveout module - the classic way to do things
+#
 waveout_SOURCES = waveout.c
+
+#
+# Borland C++ project
+# we override everything by setting intfwin_CUSTOM
+#
+intfwin_CUSTOM = yes
+BCBUILDER = "D:/Program Files/CBuilder5"
+
+../intfwin.so: Makefile
+	rm -f intfwin.mak
+	$(BCBUILDER)/Bin/bpr2mak intfwin.bpr -s | sed 's#^LIBPATH = .*#&;$$(RELEASELIBPATH)# ; s#^USERDEFINES = .*#& -DWIN32 -DPLUGIN -DMODULE_NAME_IS_intfwin -DMODULE_NAME=intfwin#' > intfwin.mak
+	$(BCBUILDER)/Bin/make -f intfwin.mak -b
+

plugins/win32/intfwin.bpr

@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.05.03"/>
-    <PROJECT value="intfwin.so"/>
+    <PROJECT value="..\intfwin.so"/>
     <OBJFILES value="win32.obj intf_win32.obj mainframe.obj network.obj playlist.obj 
       preferences.obj about.obj disc.obj control.obj menu.obj messages.obj"/>
     <RESFILES value=""/>