summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--mencoder.c22
2 files changed, 22 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 799fe5579d..450c4e2907 100644
--- a/Makefile
+++ b/Makefile
@@ -122,9 +122,6 @@ MPLAYER_DEP += Gui/libgui.a
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
diff --git a/mencoder.c b/mencoder.c
index 1f00eff8a4..4f7a03cbbd 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -109,6 +109,28 @@ static int cfg_include(struct config *conf, char *filename){
//---------------------------------------------------------------------------
+// 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;