* more options in menuconfig script

  Only tested under linux; please give feedback if something is wrong
  Some help should be written in doc/Configure.help; if you know what
  to write there, please contribute !

diff --git a/build-vlc b/build-vlc
index c43dc23db871f6ab4217ece39845deb3779f2ea3..dcee97c7e4845ffb047b9534a7580eed5e8bc050 100755 (executable)
--- a/build-vlc
+++ b/build-vlc
@@ -2,10 +2,24 @@
 
 FEATURES="
 GNOME gnome
+GNOME2 gnome2
 GTK gtk
+GTK2 gtk2
+SKINS skins
+FAMILIAR familiar
+WXWINDOWS wxwindows
+QT qt
+KDE kde
+OPIE opie
+MACOSX macosx
+QNX qnx
+INTFWIN intfwin
+NCURSES ncurses
+XOSD xosd
 DVDOLD dvd
 DVDREAD dvdread
 DVDPLAY dvdplay
+DVBPSI dvbpsi
 VCD vcd
 V4L v4l
 SAT satellite
@@ -13,11 +27,36 @@ X11 x11
 XVIDEO xvideo
 SDL sdl
 FB fb
+DIRECTX directx
+WINGDI wingdi
+FREETYPE freetype
+QTE qte
+MGA mga
+SVGALIB svgalib
+GGI ggi
+GLIDE glide
+AA aa
 OSS oss
 ESD esd
+ARTS arts
+ALSA alsa
+WAVEOUT waveout
+COREAUDIO coreaudio
+OGG ogg
 A52 a52
 MAD mad
 FFMPEG ffmpeg
+FAAD faad
+XVID xvid
+DV dv
+FLAC flac
+LIBMPEG2 libmpeg2
+VORBIS vorbis
+TREMOR tremor
+TARKIN tarkin
+THEORA theoea
+SOUT sout
+DEBUG debug
 "
 PATHS="
 FFMPEG_TREE ffmpeg-tree

diff --git a/config.in b/config.in
index 7ebebc7b962065fa17b30687bd5ec9e225e16fd8..1bf5585a9e6190d50a1f22f510f7fb18211743e2 100644 (file)
--- a/config.in
+++ b/config.in
@@ -6,21 +6,40 @@ mainmenu_name "VLC Configuration"
 
 choice 'Operating System' \
    "Linux              CONFIG_LINUX \
+    MacOS_X            CONFIG_MAC \
     Win32              CONFIG_WIN32" Linux
 
 mainmenu_option next_comment
 comment 'Graphical User Interfaces'
-bool 'Gnome interface' CONFIG_GNOME
-bool 'GTK interface' CONFIG_GTK
+bool 'Gnome interface support' CONFIG_GNOME
+bool 'Gnome2 support' CONFIG_GNOME2
+bool 'GTK+ support' CONFIG_GTK
+bool 'GTK2 support' CONFIG_GTK2
+bool 'Win32 skins module' CONFIG_SKINS
+bool 'Familiar GTK+ support' CONFIG_FAMILIAR
+bool 'wxWindows support' CONFIG_WXWINDOWS
+bool 'Qt interface support' CONFIG_QT
+bool 'KDE interface support' CONFIG_KDE
+bool 'Qt embedded interface support' CONFIG_OPIE
+if [ "$CONFIG_MAC" = "y" ]; then
+   bool 'MacOS X support' CONFIG_MACOSX
+fi
+bool 'QNX RTOS support' CONFIG_QNX
+if [ "$CONFIG_WIN32" = "y" ]; then
+   bool 'Win32 interface support' CONFIG_INTFWIN
+fi
+bool 'ncurses interface support' CONFIG_NCURSES
+bool 'xosd interface support' CONFIG_XOSD
 endmenu
 
 mainmenu_option next_comment
 comment 'Inputs'
 bool 'DVD support' CONFIG_DVD
 if [ "$CONFIG_DVD" = "y" ]; then
-   bool '    standard DVD input' CONFIG_DVDOLD
-   bool '    libdvdread' CONFIG_DVDREAD
-   bool '    libdvdplay' CONFIG_DVDPLAY
+   bool '    DVD input module' CONFIG_DVDOLD
+   bool '    dvdread input module' CONFIG_DVDREAD
+   bool '    dvdplay input module' CONFIG_DVDPLAY
+   bool '    dvbpsi ts mux and demux module' CONFIG_DVDPSI
 fi
 bool 'VCD support' CONFIG_VCD
 bool 'Video for Linux (V4L) support' CONFIG_V4L
@@ -30,28 +49,66 @@ endmenu
 mainmenu_option next_comment
 comment 'Video outputs'
 if [ "$CONFIG_LINUX" = "y" ]; then
-   bool 'X11 output' CONFIG_X11
-   bool 'XVideo output' CONFIG_XVIDEO
-   bool 'Framebuffer output' CONFIG_FB
+   bool 'X11 support' CONFIG_X11
+   bool 'XVideo support' CONFIG_XVIDEO
+   bool 'Linux framebuffer support' CONFIG_FB
+fi
+if [ "$CONFIG_WIN32" = "y" ]; then
+   bool 'Win32 DirectX support' CONFIG_DIRECTX
+   bool 'Win32 GDI module' CONFIG_WINGDI
 fi
 bool 'SDL video output' CONFIG_SDL
+bool 'freetype support' CONFIG_FREETYPE
+bool 'QT Embedded support' CONFIG_QTE
+bool 'Linux kernel Matrox support' CONFIG_MGA
+bool 'SVGAlib support' CONFIG_SVGALIB
+bool 'GGI support' CONFIG_GGI
+bool 'Glide (3dfx) support' CONFIG_GLIDE
+bool 'aalib output' CONFIG_AA
 endmenu
 
 mainmenu_option next_comment
 comment 'Audio outputs'
 if [ "$CONFIG_LINUX" = "y" ]; then
-   bool 'Open Sound System (OSS)' CONFIG_OSS
-   bool 'Enlightenment Sound Daemon (ESD)' CONFIG_ESD
+   bool 'Linux OSS /dev/dsp support' CONFIG_OSS
+   bool 'Esound library support' CONFIG_ESD
+   bool 'aRts sound server' CONFIG_ARTS
+   bool 'ALSA sound support for Linux' CONFIG_ALSA
+fi
+if [ "$CONFIG_WIN32" = "y" ]; then
+   bool 'Win32 waveOut module' CONFIG_WAVEOUT
+fi
+if [ "$CONFIG_MAC" = "y" ]; then
+   bool 'CoreAudio module' CONFIG_COREAUDIO
 fi
 endmenu
 
 mainmenu_option next_comment
 comment 'Codecs'
-bool 'A52 support' CONFIG_A52
-bool 'MAD support' CONFIG_MAD
-bool 'FFMPEG' CONFIG_FFMPEG
+bool 'Ogg demux support' CONFIG_OGG
+bool 'A/52 support' CONFIG_A52
+bool 'libmad module' CONFIG_MAD
+bool 'ffmpeg codec' CONFIG_FFMPEG
 if [ "$CONFIG_FFMPEG" = "y" ]; then
    string "ffmpeg tree" CONFIG_FFMPEG_TREE /home/videolan/ffmpeg
 fi
+bool 'faad codec' CONFIG_FAAD
+bool 'xvid codec' CONFIG_XVID
+bool 'DV decoder support' CONFIG_DV
+bool 'flac decoder support' CONFIG_FLAC
+bool 'libmpeg2 decoder support' CONFIG_LIBMPEG2
+bool 'Vorbis decoder support' CONFIG_VORBIS
+bool 'Tremor decoder support' CONFIG_TREMOR
+bool 'tarkin codec' CONFIG_TARKIN
+bool 'theora codec' CONFIG_THEORA
 endmenu
 
+mainmenu_option next_comment
+comment 'Streaming'
+bool 'Stream output modules' CONFIG_SOUT
+endmenu
+
+mainmenu_option next_comment
+comment 'Compilation options'
+bool 'Debug mode' CONFIG_DEBUG
+endmenu

diff --git a/defconfig b/defconfig
index ca2aecef00177de14aeee0bf1eff5ab3962c68ec..8ef0801dd2fb13af0176fddb0c33e86d27190d75 100644 (file)
--- a/defconfig
+++ b/defconfig
@@ -2,13 +2,25 @@
 # Automatically generated by make menuconfig: don't edit
 #
 CONFIG_LINUX=y
+# CONFIG_MAC is not set
 # CONFIG_WIN32 is not set
 
 #
 # Graphical User Interfaces
 #
 CONFIG_GNOME=y
+# CONFIG_GNOME2 is not set
 # CONFIG_GTK is not set
+# CONFIG_GTK2 is not set
+# CONFIG_SKINS is not set
+# CONFIG_FAMILIAR is not set
+# CONFIG_WXWINDOWS is not set
+# CONFIG_QT is not set
+# CONFIG_KDE is not set
+# CONFIG_OPIE is not set
+# CONFIG_QNX is not set
+# CONFIG_NCURSES is not set
+# CONFIG_XOSD is not set
 
 #
 # Inputs
@@ -17,6 +29,7 @@ CONFIG_DVD=y
 CONFIG_DVDOLD=y
 # CONFIG_DVDREAD is not set
 # CONFIG_DVDPLAY is not set
+CONFIG_DVDPSI=y
 # CONFIG_VCD is not set
 # CONFIG_V4L is not set
 # CONFIG_SAT is not set
@@ -28,17 +41,46 @@ CONFIG_X11=y
 CONFIG_XVIDEO=y
 # CONFIG_FB is not set
 # CONFIG_SDL is not set
+CONFIG_FREETYPE=y
+# CONFIG_QTE is not set
+# CONFIG_MGA is not set
+# CONFIG_SVGALIB is not set
+# CONFIG_GGI is not set
+# CONFIG_GLIDE is not set
+# CONFIG_AA is not set
 
 #
 # Audio outputs
 #
 CONFIG_OSS=y
-CONFIG_ESD=y
+# CONFIG_ESD is not set
+# CONFIG_ARTS is not set
+# CONFIG_ALSA is not set
 
 #
 # Codecs
 #
+CONFIG_OGG=y
 CONFIG_A52=y
 CONFIG_MAD=y
 CONFIG_FFMPEG=y
 CONFIG_FFMPEG_TREE="/home/cyril/ffmpeg"
+# CONFIG_FAAD is not set
+# CONFIG_XVID is not set
+# CONFIG_DV is not set
+# CONFIG_FLAC is not set
+# CONFIG_LIBMPEG2 is not set
+CONFIG_VORBIS=y
+# CONFIG_TREMOR is not set
+# CONFIG_TARKIN is not set
+# CONFIG_THEORA is not set
+
+#
+# Streaming
+#
+CONFIG_SOUT=y
+
+#
+# Compilation options
+#
+# CONFIG_DEBUG is not set