Mercurial > mplayer.hg
changeset 1991:dee4b2ea5e5b
add gui support to config scripts, and fixed some warning.
| author | pontscho |
|---|---|
| date | Thu, 27 Sep 2001 17:40:43 +0000 |
| parents | 7858bc1b360d |
| children | 156639eddf49 |
| files | Gui/bitmap.h Gui/bitmap/bitmap.h Gui/bitmap/bmp/bmp.h Gui/bitmap/tga/tga.h Makefile configure libvo/sub.c |
| diffstat | 7 files changed, 21 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/bitmap.h Thu Sep 27 17:03:39 2001 +0000 +++ b/Gui/bitmap.h Thu Sep 27 17:40:43 2001 +0000 @@ -18,4 +18,4 @@ extern int bpRead( char * fname, txSample * bf ); extern int conv24to32( txSample * bf ); -#endif \ No newline at end of file +#endif
--- a/Gui/bitmap/bitmap.h Thu Sep 27 17:03:39 2001 +0000 +++ b/Gui/bitmap/bitmap.h Thu Sep 27 17:40:43 2001 +0000 @@ -18,4 +18,4 @@ extern int bpRead( char * fname, txSample * bf ); extern int conv24to32( txSample * bf ); -#endif \ No newline at end of file +#endif
--- a/Gui/bitmap/bmp/bmp.h Thu Sep 27 17:03:39 2001 +0000 +++ b/Gui/bitmap/bmp/bmp.h Thu Sep 27 17:40:43 2001 +0000 @@ -25,4 +25,4 @@ extern int bmpRead( unsigned char * fname,txSample * bF ); -#endif \ No newline at end of file +#endif
--- a/Gui/bitmap/tga/tga.h Thu Sep 27 17:03:39 2001 +0000 +++ b/Gui/bitmap/tga/tga.h Thu Sep 27 17:40:43 2001 +0000 @@ -18,4 +18,4 @@ extern void tgaWriteTexture( char * filename,txSample * bf ); -#endif \ No newline at end of file +#endif
--- a/Makefile Thu Sep 27 17:03:39 2001 +0000 +++ b/Makefile Thu Sep 27 17:40:43 2001 +0000 @@ -23,6 +23,9 @@ VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS) PARTS = mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 drivers drivers/syncfb +ifeq ($(GUI),yes) +PARTS += Gui +endif ifneq ($(W32_LIB),) PARTS += loader loader/DirectShow @@ -74,8 +77,13 @@ encore/libencore.a: $(MAKE) -C encore +Gui/libgui.a: + $(MAKE) -C Gui MPLAYER_DEP = mplayer.o $(OBJS) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS) +ifeq ($(GUI),yes) +MPLAYER_DEP += Gui/libgui.a +endif mplayerwithoutlink: $(MPLAYER_DEP) @for a in $(PARTS); do $(MAKE) -C $$a all ; done
--- a/configure Thu Sep 27 17:03:39 2001 +0000 +++ b/configure Thu Sep 27 17:40:43 2001 +0000 @@ -1202,23 +1202,17 @@ _select='#define HAVE_AUDIO_SELECT' ;; --enable-gui) - cat <<EOF - -You've tried to enable GUI support. - -GUI code was just imported to CVS, and we didn't finished integration yet! -It's under heavy development, and it isn't trivial how to compile and run. -Do NOT flood our mailboxes with GUI-related questions and bugreports now! -We're busy with development, but we know the problems you want to report. - -Please wait until we announce it on mplayer-users list and News on homepage. - -EOF - exit + _gui=yes + ;; + --enable-new-gui) + _gui=yes ;; --enable-streaming) _streaming=yes ;; + --enable-divx4) + _divx4linux=yes + ;; --disable-css) _css=no ;; @@ -1325,15 +1319,9 @@ --disable-divx4) _divx4linux=no ;; - --enable-divx4) - _divx4linux=yes - ;; --disable-vorbis) _vorbis=no ;; - --enable-new-gui) - _gui=yes - ;; --with-win32libdir=*) _win32libdir=`echo $ac_option | cut -d '=' -f 2` _win32libdirnotify=no @@ -2192,6 +2180,7 @@ GTKLIB=$_gtklib GLIBLIB=$_gliblib GUI_LIBS = $_gui_lib +GUI=$_gui DEBUG=-DDEBUG EOF