[Mplayer-cvslog] CVS: main Makefile,1.92,1.93 mencoder.c,1.13,1.14

[Zoltan Ponekker]

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

Modified Files:
	Makefile mencoder.c 
Log Message:
kurva gui.

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- Makefile	1 Nov 2001 16:10:07 -0000	1.92
+++ Makefile	2 Nov 2001 10:26:58 -0000	1.93
@@ -122,9 +122,6 @@
 MENCODER_DEP += Gui/libgui.a
 endif
 
-mplayerwithoutlink: $(MPLAYER_DEP)	
-	@for a in $(PARTS); do $(MAKE) -C $$a all ; done
-
 $(PRG):	$(MPLAYER_DEP)
 	$(CC) -rdynamic $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm
 

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mencoder.c	2 Nov 2001 03:22:33 -0000	1.13
+++ mencoder.c	2 Nov 2001 10:26:58 -0000	1.14
@@ -109,6 +109,28 @@
 
 //---------------------------------------------------------------------------
 
+// dummy datas for gui :(
+
+#ifdef HAVE_NEW_GUI
+float rel_seek_secs=0;
+int abs_seek_pos=0;
+int use_gui=0;
+
+void exit_player(char* how){
+}
+void vo_x11_putkey(int key){
+}
+void vo_setwindow( int w,int g ) {
+}
+void vo_setwindowsize( int w,int h ) {
+}
+
+int       vo_resize = 0;
+int       vo_expose = 0;
+
+#endif
+// ---
+
 // mini dummy libvo:
 
 static unsigned char* vo_image=NULL;