Commit 35178153 authored by Rémi Duraffort's avatar Rémi Duraffort

Makefile: the wx inteface does not exist anymore.

parent 6811f460
...@@ -74,8 +74,8 @@ CC="arm-wince-pe-gcc -mcpu=xscale" \ ...@@ -74,8 +74,8 @@ CC="arm-wince-pe-gcc -mcpu=xscale" \
../configure --host=arm-wince-pe --target=arm-wince-pe \ ../configure --host=arm-wince-pe --target=arm-wince-pe \
--build=i686-linux --prefix=/usr/local/wince \ --build=i686-linux --prefix=/usr/local/wince \
--disable-sdl --disable-gtk --disable-dvdnav --disable-dvdread \ --disable-sdl --disable-gtk --disable-dvdnav --disable-dvdread \
--disable-nls --disable-sout --disable-vlm --disable-wxwindows \ --disable-nls --disable-sout --disable-vlm --disable-a52 \
--disable-a52 --disable-libmpeg2 --disable-freetype --disable-fribidi \ --disable-libmpeg2 --disable-freetype --disable-fribidi \
--disable-mad --disable-plugins --enable-optimize-memory \ --disable-mad --disable-plugins --enable-optimize-memory \
--with-freetype-config-path=/usr/local/wince-xscale/bin \ --with-freetype-config-path=/usr/local/wince-xscale/bin \
--with-fribidi-config-path=/usr/local/wince-xscale/bin \ --with-fribidi-config-path=/usr/local/wince-xscale/bin \
......
...@@ -70,7 +70,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ ...@@ -70,7 +70,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-fast-install \ --enable-fast-install \
--disable-dbus \ --disable-dbus \
--disable-dvd --disable-mad --disable-libmpeg2 \ --disable-dvd --disable-mad --disable-libmpeg2 \
--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \ --disable-ffmpeg --disable-faad --disable-skins2 \
--disable-live555 \ --disable-live555 \
--disable-fribidi --disable-glx --disable-fribidi --disable-glx
...@@ -370,7 +370,7 @@ endif ...@@ -370,7 +370,7 @@ endif
# Building aliases # Building aliases
############################################################################### ###############################################################################
ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc
bin_SCRIPTS = $(ALIASES) bin_SCRIPTS = $(ALIASES)
CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
EXTRA_SCRIPTS = $(ALL_ALIASES) EXTRA_SCRIPTS = $(ALL_ALIASES)
...@@ -388,9 +388,6 @@ rvlc: make-alias Makefile ...@@ -388,9 +388,6 @@ rvlc: make-alias Makefile
svlc: make-alias Makefile svlc: make-alias Makefile
$(MKALIAS) skins2 $(MKALIAS) skins2
wxvlc: make-alias Makefile
$(MKALIAS) wx
qvlc: make-alias Makefile qvlc: make-alias Makefile
$(MKALIAS) qt4 $(MKALIAS) qt4
......
...@@ -11,11 +11,6 @@ choice 'Operating System' \ ...@@ -11,11 +11,6 @@ choice 'Operating System' \
mainmenu_option next_comment mainmenu_option next_comment
comment 'User Interfaces' comment 'User Interfaces'
bool 'wxWidgets interface' CONFIG_WXWIDGETS
if [ "$CONFIG_WXWIDGETS" = "y" ]; then
string 'wx-config path' CONFIG_WITHWXCONFIGPATH ""
string 'wx-config name' CONFIG_WITHWXCONFIG ""
fi
bool 'QT4 interface' CONFIG_QT4 bool 'QT4 interface' CONFIG_QT4
bool 'Skins interface' CONFIG_SKINS bool 'Skins interface' CONFIG_SKINS
if [ "$CONFIG_SKINS" = "y" ]; then if [ "$CONFIG_SKINS" = "y" ]; then
......
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