[Mplayer-cvslog] CVS: main Makefile,1.101,1.102 mplayer.c,1.318,1.319

[David Holm]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv19103

Modified Files:
	Makefile mplayer.c 
Log Message:
Forgot that we use configure with static Makefiles ;) sorry...


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Makefile	14 Nov 2001 01:41:32 -0000	1.101
+++ Makefile	14 Nov 2001 13:23:07 -0000	1.102
@@ -21,14 +21,14 @@
 # a BSD compatible 'install' program
 INSTALL = install
 
-SRCS_MENCODER = divx4_vbr.c mencoder.c libvo/aclib.c libvo/img_format.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c codec-cfg.c cfgparser.c
+SRCS_MENCODER = divx4_vbr.c $(VODIR)/aclib.c $(VODIR)/img_format.c  mencoder.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c codec-cfg.c cfgparser.c
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 
 SRCS_MPLAYER = mplayer.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c msvidc.c codec-cfg.c subreader.c lirc_mp.c cfgparser.c mixer.c spudec.c my_profile.c
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
-CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(EXTRA_INC) $(MADLIB_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(EXTRA_INC) $(MADLIB_INC) # -Wall
 A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) $(MADLIB_LIB) $(SGI_AUDIO_LIB)
-VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS)
+VO_LIBS = $(MLIB_LIB) $(X_LIBS)
 OSDEP_LIBS = -Llinux -losdep
 PP_LIBS = -Lpostproc -lpostproc
 XA_LIBS = -Lxa -lxa
@@ -36,7 +36,7 @@
 # SRCS = $(SRCS_MENCODER) $(SRCS_MPLAYER)
 # OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER)
 
-PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa
+PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec $(VODIR) libao2 drivers drivers/syncfb linux postproc xa
 
 ifeq ($(GUI),yes)
 PARTS += Gui
@@ -67,7 +67,7 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+COMMONLIBS = libmpdemux/libmpdemux.a $(VODIR)/$(VODIR).a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
 
 loader/libloader.a:
 	$(MAKE) -C loader
@@ -86,6 +86,9 @@
 
 libvo/libvo.a:
 	$(MAKE) -C libvo
+
+libvo2/libvo2.a:
+	$(MAKE) -C libvo2
 
 libao2/libao2.a:
 	$(MAKE) -C libao2

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- mplayer.c	14 Nov 2001 11:16:45 -0000	1.318
+++ mplayer.c	14 Nov 2001 13:23:07 -0000	1.319
@@ -1300,7 +1300,9 @@
 #ifdef HAVE_NEW_GUI
       if(use_gui) EventHandling();
 #endif
+#ifndef USE_LIBVO2
       video_out->check_events(); // check events AST
+#endif
     } else {
       // It's time to sleep...
       current_module="sleep";