* install-win32, Makefile.am: added the html faq to the win32 package.

* toolbox, msvc/*: few fixes to the msvc project files generation.
   (compiling plugins won't work yet because there are a few hacks that
    need to be done in order to compile dlls that use the c-runtime)

diff --git a/Makefile.am b/Makefile.am
index 70e9c9f91cb069fd8418313a8851f3eecdd1d199..04f42f0cced97c2447d25cb0839f703a3e817aec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -546,6 +546,9 @@ package-win32:
                cp po/$${i}.gmo tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
        done
 
+       cd doc/faq ; $(MAKE) html ; cd ../.. ;
+       cp doc/faq/index.html tmp/faq.htm ;
+
 # Create package 
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
 # Clean up

diff --git a/install-win32 b/install-win32
index 982666123f79f5c0eb9b32e69c0640bf5bb7f830..0106100989f598742e366f1d9640896061c60a60 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -5,6 +5,8 @@
 ;;;;;;;;;;;;;\r
 ; CHANGELOG ;\r
 ;;;;;;;;;;;;;\r
+; modifications by Gildas Bazin <gbazin@netcourrier.com> 01 Mar 2003\r
+; . added a shortcut to the faq in the menu.\r
 ; modifications by Gildas Bazin <gbazin@netcourrier.com> 26 Feb 2003\r
 ; . added the locale directory.\r
 ; modifications by Samuel Hocevar <sam@zoy.org> 05 Apr 2002\r
@@ -62,6 +64,7 @@ Section "Install"
 \r
        CreateDirectory "$SMPROGRAMS\VideoLAN"\r
        CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" "$INSTDIR\vlc.exe" \r
+       CreateShortCut "$SMPROGRAMS\VideoLAN\FAQ.lnk" "$INSTDIR\faq.htm"\r
        CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\uninstall.exe"\r
        WriteUninstaller "uninstall.exe"\r
 \r

diff --git a/msvc/config.h.in b/msvc/config.h.in
index b9dbd5f124b4a95b9c175bad9cd7484f505a0726..af111b3b63f1a9024662d69b7e4e90c06ab99403 100644 (file)
--- a/msvc/config.h.in
+++ b/msvc/config.h.in
@@ -50,7 +50,7 @@
 #define HAVE_ARGZ_H 1
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
+/* #undef HAVE_ARPA_INET_H */
 
 /* Define to 1 if you have the `atoll' function. */
 /* #undef HAVE_ATOLL */

diff --git a/msvc/vlc.dsw b/msvc/vlc.dsw
index 348e0155a40ae23445d01f216f21cbea7557a968..7c3f8196e33c40793ccf048be2e9fed211a5c1e6 100644 (file)
--- a/msvc/vlc.dsw
+++ b/msvc/vlc.dsw
@@ -15,18 +15,6 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "plugins"=.\plugins.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
 Project: "vlc"=.\vlc.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r

diff --git a/toolbox b/toolbox
index c8ca38b9ede3c724a461dc477a7210d57249ec7b..48b8664adb3a2accaa95de44d034196bf64748e9 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.9 2003/02/02 04:01:29 sam Exp $
+##  $Id: toolbox,v 1.10 2003/03/01 19:25:13 gbazin Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -238,6 +238,7 @@ EOF
         cat >> ${target} << EOF
 # Begin Source File${M}
 SOURCE="..\\${cfile}"${M}
+# ADD CPP /D "__VLC__" /D "__PLUGIN__"  /D "MODULE_NAME=${plugin}" /D "MODULE_NAME_IS_${plugin}" ${M}
 # End Source File${M}
 EOF
       done