# HG changeset patch # User diego # Date 1174003213 0 # Node ID 8e6182a7500606cc8e9fa390c89988191e774ca0 # Parent cd50e0497989c27253d6b5cb0ed6dbc687ed651c Don't look for header files in ../../ anymore. Compilation was broken unless some random subdirectory of the Gui directory was added as header search path to CFLAGS ... diff -r cd50e0497989 -r 8e6182a75006 Gui/mplayer/gtk/about.c --- a/Gui/mplayer/gtk/about.c Thu Mar 15 23:28:38 2007 +0000 +++ b/Gui/mplayer/gtk/about.c Fri Mar 16 00:00:13 2007 +0000 @@ -1,7 +1,7 @@ -#include "../app.h" -#include "../../config.h" -#include "../../help_mp.h" +#include "app.h" +#include "config.h" +#include "help_mp.h" #include "mplayer/pixmaps/about.xpm" #include "../widgets.h" diff -r cd50e0497989 -r 8e6182a75006 Gui/mplayer/gtk/eq.c --- a/Gui/mplayer/gtk/eq.c Thu Mar 15 23:28:38 2007 +0000 +++ b/Gui/mplayer/gtk/eq.c Fri Mar 16 00:00:13 2007 +0000 @@ -9,13 +9,13 @@ #include #include -#include "../app.h" -#include "../cfg.h" -#include "../../config.h" -#include "../../help_mp.h" -#include "../../mplayer.h" -#include "../../libaf/equalizer.h" -#include "../../libvo/video_out.h" +#include "app.h" +#include "cfg.h" +#include "config.h" +#include "help_mp.h" +#include "mplayer.h" +#include "libaf/equalizer.h" +#include "libvo/video_out.h" #include "../widgets.h" #include "mplayer.h" diff -r cd50e0497989 -r 8e6182a75006 Gui/mplayer/gtk/fs.c --- a/Gui/mplayer/gtk/fs.c Thu Mar 15 23:28:38 2007 +0000 +++ b/Gui/mplayer/gtk/fs.c Fri Mar 16 00:00:13 2007 +0000 @@ -7,17 +7,17 @@ #include #include "../gmplayer.h" -#include "../../mplayer.h" +#include "mplayer.h" #include "mplayer/pixmaps/up.xpm" #include "mplayer/pixmaps/dir.xpm" #include "mplayer/pixmaps/file.xpm" -#include "../app.h" -#include "../interface.h" -#include "../../config.h" -#include "../../help_mp.h" -#include "../../stream/stream.h" +#include "app.h" +#include "interface.h" +#include "config.h" +#include "help_mp.h" +#include "stream/stream.h" #include "../widgets.h" #include "fs.h" diff -r cd50e0497989 -r 8e6182a75006 Gui/mplayer/gtk/mb.c --- a/Gui/mplayer/gtk/mb.c Thu Mar 15 23:28:38 2007 +0000 +++ b/Gui/mplayer/gtk/mb.c Fri Mar 16 00:00:13 2007 +0000 @@ -1,7 +1,7 @@ -#include "../app.h" -#include "../../config.h" -#include "../../help_mp.h" +#include "app.h" +#include "config.h" +#include "help_mp.h" #include "../pixmaps/error.xpm" #include "../pixmaps/warning.xpm" diff -r cd50e0497989 -r 8e6182a75006 Gui/mplayer/gtk/menu.c --- a/Gui/mplayer/gtk/menu.c Thu Mar 15 23:28:38 2007 +0000 +++ b/Gui/mplayer/gtk/menu.c Fri Mar 16 00:00:13 2007 +0000 @@ -3,21 +3,21 @@ #include #include -#include "../../config.h" -#include "../../help_mp.h" -#include "../../mplayer.h" -#include "../../access_mpcontext.h" -#include "../../mixer.h" +#include "config.h" +#include "help_mp.h" +#include "mplayer.h" +#include "access_mpcontext.h" +#include "mixer.h" -#include "../app.h" +#include "app.h" #include "menu.h" #include "../widgets.h" #include "app.h" -#include "../../stream/stream.h" -#include "../../libmpdemux/demuxer.h" -#include "../../libmpdemux/stheader.h" +#include "stream/stream.h" +#include "../libmpdemux/demuxer.h" +#include "../libmpdemux/stheader.h" #include "../pixmaps/ab.xpm" #include "../pixmaps/half.xpm" diff -r cd50e0497989 -r 8e6182a75006 Gui/mplayer/gtk/opts.c --- a/Gui/mplayer/gtk/opts.c Thu Mar 15 23:28:38 2007 +0000 +++ b/Gui/mplayer/gtk/opts.c Fri Mar 16 00:00:13 2007 +0000 @@ -7,16 +7,16 @@ #include #include -#include "../../config.h" -#include "../../help_mp.h" -#include "../../mixer.h" -#include "../../libao2/audio_out.h" -#include "../../libvo/video_out.h" -#include "../../mplayer.h" +#include "config.h" +#include "help_mp.h" +#include "mixer.h" +#include "libao2/audio_out.h" +#include "libvo/video_out.h" +#include "mplayer.h" -#include "../app.h" -#include "../cfg.h" -#include "../interface.h" +#include "app.h" +#include "cfg.h" +#include "interface.h" #include "../widgets.h" #include "opts.h" #include "fs.h" @@ -26,8 +26,8 @@ typedef struct sh_audio_t sh_audio_t; // for mpcodecs_[av]d_drivers: -#include "../../libmpcodecs/vd.h" -#include "../../libmpcodecs/ad.h" +#include "libmpcodecs/vd.h" +#include "libmpcodecs/ad.h" GtkWidget * Preferences = NULL; static GtkWidget * AConfig; diff -r cd50e0497989 -r 8e6182a75006 Gui/mplayer/gtk/pl.c --- a/Gui/mplayer/gtk/pl.c Thu Mar 15 23:28:38 2007 +0000 +++ b/Gui/mplayer/gtk/pl.c Fri Mar 16 00:00:13 2007 +0000 @@ -10,11 +10,11 @@ #include #include -#include "../../config.h" -#include "../../help_mp.h" -#include "../stream/stream.h" +#include "config.h" +#include "help_mp.h" +#include "stream/stream.h" -#include "../interface.h" +#include "interface.h" #include "../widgets.h" #include "pl.h" #include "common.h" diff -r cd50e0497989 -r 8e6182a75006 Gui/mplayer/gtk/sb.c --- a/Gui/mplayer/gtk/sb.c Thu Mar 15 23:28:38 2007 +0000 +++ b/Gui/mplayer/gtk/sb.c Fri Mar 16 00:00:13 2007 +0000 @@ -9,9 +9,9 @@ #include "sb.h" #include "common.h" -#include "../app.h" -#include "../../config.h" -#include "../../help_mp.h" +#include "app.h" +#include "config.h" +#include "help_mp.h" #include "../widgets.h" #include "app.h" diff -r cd50e0497989 -r 8e6182a75006 Gui/mplayer/gtk/url.c --- a/Gui/mplayer/gtk/url.c Thu Mar 15 23:28:38 2007 +0000 +++ b/Gui/mplayer/gtk/url.c Fri Mar 16 00:00:13 2007 +0000 @@ -11,10 +11,10 @@ #include "url.h" #include "common.h" -#include "../interface.h" -#include "../app.h" +#include "interface.h" +#include "app.h" #include "../widgets.h" -#include "../help_mp.h" +#include "help_mp.h" GtkWidget * URL = NULL;