Skip to content

V
vlc
Commit bfb18bbd authored by Cyril Deguet's avatar Cyril Deguet
Browse files
Options

* config.in: wxwindows -> wxwidgets. Added a HTTPD option

parent 8e4bbaa9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
build-vlc
View file @ bfb18bbd
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
FEATURES=" FEATURES="
SKINS skins2 SKINS skins2
PDA pda PDA pda
WXWINDOWS wxwindows WXWIDGETS wxwidgets
OPIE opie OPIE opie
MACOSX macosx MACOSX macosx
QNX qnx QNX qnx
...@@ -86,6 +86,7 @@ SOUT sout ...@@ -86,6 +86,7 @@ SOUT sout
WITHFFMPEGMP3LAME ffmpeg-mp3lame WITHFFMPEGMP3LAME ffmpeg-mp3lame
WITHFFMPEGFAAC ffmpeg-faac WITHFFMPEGFAAC ffmpeg-faac
GALAKTOS galaktos GALAKTOS galaktos
HTTPD httpd
" "
PATHS=" PATHS="
WITHXML2CONFIGPATH xml2-config-path WITHXML2CONFIGPATH xml2-config-path
......
config.in
View file @ bfb18bbd
...@@ -16,8 +16,8 @@ if [ "$CONFIG_SKINS" = "y" ]; then ...@@ -16,8 +16,8 @@ if [ "$CONFIG_SKINS" = "y" ]; then
string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH "" string 'xml2-config path' CONFIG_WITHXML2CONFIGPATH ""
fi fi
bool 'PDA interface (via Gtk2) support' CONFIG_PDA bool 'PDA interface (via Gtk2) support' CONFIG_PDA
bool 'wxWindows support' CONFIG_WXWINDOWS bool 'wxWidgets support' CONFIG_WXWIDGETS
if [ "$CONFIG_WXWINDOWS" = "y" ]; then if [ "$CONFIG_WXWIDGETS" = "y" ]; then
string 'wx-config path' CONFIG_WITHWXCONFIGPATH "" string 'wx-config path' CONFIG_WITHWXCONFIGPATH ""
fi fi
bool 'Qt embedded interface support (opie)' CONFIG_OPIE bool 'Qt embedded interface support (opie)' CONFIG_OPIE
...@@ -216,6 +216,7 @@ if [ "$CONFIG_MOZILLA" = "y" ]; then ...@@ -216,6 +216,7 @@ if [ "$CONFIG_MOZILLA" = "y" ]; then
string ' Path to win32 mozilla sdk' CONFIG_WITHMOZILLASDKPATH "" string ' Path to win32 mozilla sdk' CONFIG_WITHMOZILLASDKPATH ""
fi fi
bool 'Build test modules' COFIG_TESTSUITE bool 'Build test modules' COFIG_TESTSUITE
bool 'Enable http daemon' COFIG_HTTPD
# TODO: --disable-plugins # TODO: --disable-plugins
endmenu endmenu
......
defconfig
View file @ bfb18bbd
...@@ -11,7 +11,7 @@ CONFIG_LINUX=y ...@@ -11,7 +11,7 @@ CONFIG_LINUX=y
CONFIG_SKINS=y CONFIG_SKINS=y
CONFIG_WITHXML2CONFIGPATH="" CONFIG_WITHXML2CONFIGPATH=""
# CONFIG_PDA is not set # CONFIG_PDA is not set
CONFIG_WXWINDOWS=y CONFIG_WXWIDGETS=y
CONFIG_WITHWXCONFIGPATH="" CONFIG_WITHWXCONFIGPATH=""
# CONFIG_OPIE is not set # CONFIG_OPIE is not set
# CONFIG_QNX is not set # CONFIG_QNX is not set
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment