* ./Makefile, ./configure.in: misc BeOS build fixes.

ChangeLog

@@ -4,6 +4,7 @@
 
 HEAD
 
+  * ./Makefile, ./configure.in: misc BeOS build fixes.
   * ./plugins/win32/win32.cpp: fixed `--intf intfwin' which wasn't working.
   * ./Makefile: we don't include the Gtk+ and SDL DLLs in the win32 package
     anymore, the package is now 700k instead of 4MB.

Makefile

@@ -401,7 +401,9 @@ package-win32:
 			unix2dos tmp/$${file}.txt ; done
 	mkdir tmp/plugins
 	cp $(PLUGINS:%=plugins/%.so) tmp/plugins/ 
-	$(STRIP) tmp/$(PLUGINS:%=plugins/%.so)
+	# don't include these two
+	#rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
+	$(STRIP) $(PLUGINS:%=tmp/plugins/%.so)
 	mkdir tmp/share
 	for file in default8x16.psf default8x9.psf ; \
 		do cp share/$$file tmp/share/ ; done
@@ -422,13 +424,17 @@ package-beos:
 	mkdir -p tmp/vlc/share
 	# Copy relevant files
 	cp vlc tmp/vlc/
+	strip tmp/vlc/vlc
 	cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/
 	for file in default8x16.psf default8x9.psf ; \
 		do cp share/$$file tmp/vlc/share/ ; done
+	mkdir tmp/vlc/plugins
+	cp $(PLUGINS:%=plugins/%.so) tmp/vlc/plugins/ 
+	strip $(PLUGINS:%=tmp/vlc/plugins/%.so)
 	# Create package 
 	mv tmp/vlc tmp/vlc-${VERSION}
 	(cd tmp ; find vlc-${VERSION} | \
-	zip -9 -@ vlc-${VERSION}-beos.zip )
+	zip -9 -@ vlc-${VERSION}-BeOS-x86.zip )
 	mv tmp/vlc-${VERSION}-BeOS-x86.zip .
 	# Clean up
 	rm -Rf tmp

configure.in

@@ -88,6 +88,7 @@ case x"${target_os}" in
     ;;
   xbeos)
     SYS=beos
+    save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"
     vlc_LDFLAGS="${vlc_LDFLAGS} -lbe"
     plugins_LDFLAGS="${plugins_LDFLAGS} -nostart"
     beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker"
@@ -98,12 +99,6 @@ case x"${target_os}" in
     ;;
 esac
 
-dnl Flags needed for clean BeOS compilation
-if test x"${SYS}" != xbeos
-then
-  save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"
-fi
-
 dnl Flags for plugin compilation
 if test x"${SYS}" = xmingw32
 then

plugins/beos/VideoWindow.h

@@ -2,7 +2,7 @@
  * VideoWindow.h: BeOS video window class prototype
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: VideoWindow.h,v 1.16 2002/04/01 07:37:53 tcastley Exp $
+ * $Id: VideoWindow.h,v 1.17 2002/04/05 21:26:29 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Tony Castley <tcastley@mail.powerup.com.au>
@@ -92,4 +92,4 @@ private:
 
 };
 
- 
+ 
\ No newline at end of file