[MPlayer-cvslog] CVS: main/libmenu menu.c, 1.11, 1.12 menu_cmdlist.c, 1.2, 1.3 menu_console.c, 1.11, 1.12 menu_dvbin.c, 1.3, 1.4 menu_filesel.c, 1.11, 1.12 menu_list.c, 1.4, 1.5 menu_param.c, 1.3, 1.4 menu_pt.c, 1.3, 1.4 menu_txt.c, 1.2, 1.3 vf_menu.c, 1.11, 1.12
Diego Biurrun CVS
syncmail at mplayerhq.hu
Wed Oct 26 02:07:45 CEST 2005
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main/libmenu
In directory mail:/var2/tmp/cvs-serv3848
Modified Files:
menu.c menu_cmdlist.c menu_console.c menu_dvbin.c
menu_filesel.c menu_list.c menu_param.c menu_pt.c menu_txt.c
vf_menu.c
Log Message:
Unify include paths, -I.. is in CFLAGS.
Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- menu.c 16 Aug 2003 09:50:45 -0000 1.11
+++ menu.c 26 Oct 2005 00:07:43 -0000 1.12
@@ -1,5 +1,5 @@
-#include "../config.h"
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
@@ -7,16 +7,16 @@
#include <fcntl.h>
#include <unistd.h>
-#include "../libvo/osd.h"
-#include "../libvo/font_load.h"
-#include "../osdep/keycodes.h"
-#include "../asxparser.h"
-#include "../libmpdemux/stream.h"
+#include "libvo/osd.h"
+#include "libvo/font_load.h"
+#include "osdep/keycodes.h"
+#include "asxparser.h"
+#include "libmpdemux/stream.h"
#include "img_format.h"
#include "mp_image.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
#include "menu.h"
extern menu_info_t menu_info_cmdlist;
Index: menu_cmdlist.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu_cmdlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- menu_cmdlist.c 28 Dec 2002 18:51:09 -0000 1.2
+++ menu_cmdlist.c 26 Oct 2005 00:07:43 -0000 1.3
@@ -1,5 +1,5 @@
-#include "../config.h"
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
@@ -9,16 +9,16 @@
#include "img_format.h"
#include "mp_image.h"
-#include "../m_option.h"
-#include "../m_struct.h"
-#include "../asxparser.h"
+#include "m_option.h"
+#include "m_struct.h"
+#include "asxparser.h"
#include "menu.h"
#include "menu_list.h"
-#include "../libvo/font_load.h"
+#include "libvo/font_load.h"
-#include "../input/input.h"
-#include "../version.h"
+#include "input/input.h"
+#include "version.h"
Index: menu_console.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu_console.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- menu_console.c 2 Dec 2004 14:37:16 -0000 1.11
+++ menu_console.c 26 Oct 2005 00:07:43 -0000 1.12
@@ -1,5 +1,5 @@
-#include "../config.h"
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
@@ -16,14 +16,14 @@
#include "img_format.h"
#include "mp_image.h"
-#include "../m_struct.h"
-#include "../m_option.h"
+#include "m_struct.h"
+#include "m_option.h"
#include "menu.h"
-#include "../libvo/font_load.h"
-#include "../osdep/keycodes.h"
-#include "../input/input.h"
-#include "../osdep/timer.h"
+#include "libvo/font_load.h"
+#include "osdep/keycodes.h"
+#include "input/input.h"
+#include "osdep/timer.h"
typedef struct history_st history_t;
Index: menu_dvbin.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu_dvbin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- menu_dvbin.c 26 Apr 2004 21:20:37 -0000 1.3
+++ menu_dvbin.c 26 Oct 2005 00:07:43 -0000 1.4
@@ -11,20 +11,20 @@
#include <limits.h>
-#include "../config.h"
+#include "config.h"
-#include "../m_struct.h"
-#include "../m_option.h"
+#include "m_struct.h"
+#include "m_option.h"
#include "img_format.h"
#include "mp_image.h"
#include "menu.h"
#include "menu_list.h"
-#include "../input/input.h"
-#include "../osdep/keycodes.h"
+#include "input/input.h"
+#include "osdep/keycodes.h"
-#include "../libmpdemux/dvbin.h"
+#include "libmpdemux/dvbin.h"
Index: menu_filesel.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu_filesel.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- menu_filesel.c 22 Jul 2005 22:52:13 -0000 1.11
+++ menu_filesel.c 26 Oct 2005 00:07:43 -0000 1.12
@@ -11,18 +11,18 @@
#include <limits.h>
-#include "../config.h"
+#include "config.h"
-#include "../m_struct.h"
-#include "../m_option.h"
+#include "m_struct.h"
+#include "m_option.h"
#include "img_format.h"
#include "mp_image.h"
#include "menu.h"
#include "menu_list.h"
-#include "../input/input.h"
-#include "../osdep/keycodes.h"
+#include "input/input.h"
+#include "osdep/keycodes.h"
struct list_entry_s {
struct list_entry p;
Index: menu_list.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu_list.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- menu_list.c 24 Sep 2003 07:35:59 -0000 1.4
+++ menu_list.c 26 Oct 2005 00:07:43 -0000 1.5
@@ -4,7 +4,7 @@
#include <ctype.h>
#include <string.h>
-#include "../config.h"
+#include "config.h"
#include "img_format.h"
#include "mp_image.h"
@@ -12,8 +12,8 @@
#include "m_struct.h"
#include "menu.h"
-#include "../libvo/font_load.h"
-#include "../osdep/keycodes.h"
+#include "libvo/font_load.h"
+#include "osdep/keycodes.h"
#define IMPL 1
#include "menu_list.h"
Index: menu_param.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu_param.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- menu_param.c 13 Sep 2003 18:02:20 -0000 1.3
+++ menu_param.c 26 Oct 2005 00:07:43 -0000 1.4
@@ -9,20 +9,20 @@
#include <ctype.h>
-#include "../config.h"
+#include "config.h"
-#include "../m_struct.h"
-#include "../m_option.h"
-#include "../m_config.h"
-#include "../asxparser.h"
+#include "m_struct.h"
+#include "m_option.h"
+#include "m_config.h"
+#include "asxparser.h"
#include "img_format.h"
#include "mp_image.h"
#include "menu.h"
#include "menu_list.h"
-#include "../input/input.h"
-#include "../osdep/keycodes.h"
+#include "input/input.h"
+#include "osdep/keycodes.h"
struct list_entry_s {
struct list_entry p;
Index: menu_pt.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu_pt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- menu_pt.c 26 Jan 2003 15:55:35 -0000 1.3
+++ menu_pt.c 26 Oct 2005 00:07:43 -0000 1.4
@@ -4,19 +4,19 @@
#include <string.h>
//#include <libgen.h>
-#include "../config.h"
+#include "config.h"
#include "img_format.h"
#include "mp_image.h"
-#include "../m_struct.h"
-#include "../m_option.h"
+#include "m_struct.h"
+#include "m_option.h"
#include "menu.h"
#include "menu_list.h"
-#include "../playtree.h"
-#include "../input/input.h"
+#include "playtree.h"
+#include "input/input.h"
#define mp_basename(s) (strrchr((s),'/')==NULL?(char*)(s):(strrchr((s),'/')+1))
Index: menu_txt.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu_txt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- menu_txt.c 9 Feb 2003 20:18:20 -0000 1.2
+++ menu_txt.c 26 Oct 2005 00:07:43 -0000 1.3
@@ -1,5 +1,5 @@
-#include "../config.h"
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
@@ -8,12 +8,12 @@
#include "img_format.h"
#include "mp_image.h"
-#include "../m_struct.h"
-#include "../m_option.h"
+#include "m_struct.h"
+#include "m_option.h"
#include "menu.h"
-#include "../libvo/font_load.h"
-#include "../osdep/keycodes.h"
+#include "libvo/font_load.h"
+#include "osdep/keycodes.h"
struct menu_priv_s {
char** lines;
Index: vf_menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/vf_menu.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vf_menu.c 2 Oct 2004 12:17:28 -0000 1.11
+++ vf_menu.c 26 Oct 2005 00:07:43 -0000 1.12
@@ -1,5 +1,5 @@
-#include "../config.h"
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
@@ -9,17 +9,17 @@
#include <malloc.h>
#endif
-#include "../mp_msg.h"
+#include "mp_msg.h"
-#include "../libmpcodecs/img_format.h"
-#include "../libmpcodecs/mp_image.h"
-#include "../libmpcodecs/vf.h"
-
-#include "../libvo/fastmemcpy.h"
-#include "../libvo/video_out.h"
-#include "../libvo/font_load.h"
-#include "../input/input.h"
-#include "../m_struct.h"
+#include "libmpcodecs/img_format.h"
+#include "libmpcodecs/mp_image.h"
+#include "libmpcodecs/vf.h"
+
+#include "libvo/fastmemcpy.h"
+#include "libvo/video_out.h"
+#include "libvo/font_load.h"
+#include "input/input.h"
+#include "m_struct.h"
#include "menu.h"
extern vo_functions_t* video_out;
More information about the MPlayer-cvslog
mailing list