[vlc-devel] commit: Makefile: the wx inteface does not exist anymore. ( Rémi Duraffort )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Duraffort <ivoire at videolan.org> | Tue Jul  7 09:45:36 2009 +0200| [513e146db52e6b7d85d448421600dac572c7c364] | committer: Rémi Duraffort 

Makefile: the wx inteface does not exist anymore.
(cherry picked from commit 35178153c92e47fe83c1c09c3960042f02babf90)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=513e146db52e6b7d85d448421600dac572c7c364
---

 INSTALL.wince |    4 ++--
 Makefile.am   |    7 ++-----
 config.in     |    5 -----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/INSTALL.wince b/INSTALL.wince
index 487eae7..30ebb52 100644
--- a/INSTALL.wince
+++ b/INSTALL.wince
@@ -74,8 +74,8 @@ CC="arm-wince-pe-gcc -mcpu=xscale" \
    ../configure --host=arm-wince-pe --target=arm-wince-pe \
     --build=i686-linux --prefix=/usr/local/wince \
     --disable-sdl --disable-gtk --disable-dvdnav --disable-dvdread \
-    --disable-nls --disable-sout --disable-vlm --disable-wxwindows \
-    --disable-a52 --disable-libmpeg2 --disable-freetype --disable-fribidi \
+    --disable-nls --disable-sout --disable-vlm --disable-a52 \
+    --disable-libmpeg2 --disable-freetype --disable-fribidi \
     --disable-mad --disable-plugins --enable-optimize-memory \
     --with-freetype-config-path=/usr/local/wince-xscale/bin \
     --with-fribidi-config-path=/usr/local/wince-xscale/bin \
diff --git a/Makefile.am b/Makefile.am
index 26f9b6a..42eb9fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,7 +88,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-fast-install \
 	--disable-dbus \
 	--disable-dvd --disable-mad --disable-libmpeg2 \
-	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
+	--disable-ffmpeg --disable-faad --disable-skins2 \
 	--disable-live555 \
 	--disable-fribidi --disable-glx
 
@@ -374,7 +374,7 @@ endif
 # Building aliases
 ###############################################################################
 
-ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc
+ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc
 bin_SCRIPTS = $(ALIASES)
 CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
 EXTRA_SCRIPTS = $(ALL_ALIASES)
@@ -392,9 +392,6 @@ rvlc: make-alias Makefile
 svlc: make-alias Makefile
 	$(MKALIAS) skins2
 
-wxvlc: make-alias Makefile
-	$(MKALIAS) wx
-
 qvlc: make-alias Makefile
 	$(MKALIAS) qt4
 
diff --git a/config.in b/config.in
index 9828ec5..bd5b7ae 100644
--- a/config.in
+++ b/config.in
@@ -11,11 +11,6 @@ choice 'Operating System' \
 
 mainmenu_option next_comment
 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 'Skins interface' CONFIG_SKINS
 if [ "$CONFIG_SKINS" = "y" ]; then