diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-26 00:07:43 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-26 00:07:43 +0000 |
commit | 5aba6c3cfd3011bbbca3cd93deade7362475633c (patch) | |
tree | 3a0f1fcb2148ab1b04ef2cafa4d447c78886cb28 /libmenu | |
parent | 1af991cdf103bc60f8e0bbbb265096a04f271eb7 (diff) | |
download | mpv-5aba6c3cfd3011bbbca3cd93deade7362475633c.tar.bz2 mpv-5aba6c3cfd3011bbbca3cd93deade7362475633c.tar.xz |
Unify include paths, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16863 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu')
-rw-r--r-- | libmenu/menu.c | 16 | ||||
-rw-r--r-- | libmenu/menu_cmdlist.c | 14 | ||||
-rw-r--r-- | libmenu/menu_console.c | 14 | ||||
-rw-r--r-- | libmenu/menu_dvbin.c | 12 | ||||
-rw-r--r-- | libmenu/menu_filesel.c | 10 | ||||
-rw-r--r-- | libmenu/menu_list.c | 6 | ||||
-rw-r--r-- | libmenu/menu_param.c | 14 | ||||
-rw-r--r-- | libmenu/menu_pt.c | 10 | ||||
-rw-r--r-- | libmenu/menu_txt.c | 10 | ||||
-rw-r--r-- | libmenu/vf_menu.c | 20 |
10 files changed, 63 insertions, 63 deletions
diff --git a/libmenu/menu.c b/libmenu/menu.c index 0468e85c37..eb7ec2c57d 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -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; diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c index 165c561a6c..0e4730f61a 100644 --- a/libmenu/menu_cmdlist.c +++ b/libmenu/menu_cmdlist.c @@ -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" diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c index 9eca389346..936692a566 100644 --- a/libmenu/menu_console.c +++ b/libmenu/menu_console.c @@ -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; diff --git a/libmenu/menu_dvbin.c b/libmenu/menu_dvbin.c index 0885014848..cdec9c72d8 100644 --- a/libmenu/menu_dvbin.c +++ b/libmenu/menu_dvbin.c @@ -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" diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c index 9930188c42..7d40047cc9 100644 --- a/libmenu/menu_filesel.c +++ b/libmenu/menu_filesel.c @@ -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; diff --git a/libmenu/menu_list.c b/libmenu/menu_list.c index 0b0a894555..8a2717751b 100644 --- a/libmenu/menu_list.c +++ b/libmenu/menu_list.c @@ -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" diff --git a/libmenu/menu_param.c b/libmenu/menu_param.c index af8875afd4..d87db16f8a 100644 --- a/libmenu/menu_param.c +++ b/libmenu/menu_param.c @@ -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; diff --git a/libmenu/menu_pt.c b/libmenu/menu_pt.c index 42fc83531b..5ccd2f13fa 100644 --- a/libmenu/menu_pt.c +++ b/libmenu/menu_pt.c @@ -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)) diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c index 25db493129..0798108466 100644 --- a/libmenu/menu_txt.c +++ b/libmenu/menu_txt.c @@ -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; diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 9a01a86073..d7da845252 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -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 "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 "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; |