Use explicit path for headers from the loader/ directory.
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 15 Mar 2007 22:34:45 +0000 (22:34 +0000)
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 15 Mar 2007 22:34:45 +0000 (22:34 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@22624 b3059339-0415-0410-9bf9-f77b7e298cf2

libmpdemux/Makefile
libmpdemux/demux_avs.c
libmpdemux/demux_mkv.c

index 55e2836..b973c76 100644 (file)
@@ -65,8 +65,6 @@ SRCS_MENCODER = muxer.c \
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT)     += muxer_lavf.c
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO)  += muxer_lavf.c
 
-CFLAGS = -I../loader
-
 CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
 CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
index e46dbc9..81c76ec 100644 (file)
 #include "stheader.h"
 #include "libvo/fastmemcpy.h"
 
-#include "wine/windef.h"
+#include "loader/wine/windef.h"
 
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
 #include "demux_avs.h"
index a197830..28e9cc8 100644 (file)
@@ -29,7 +29,7 @@
 #include "libass/ass_mp.h"
 
 #ifdef USE_QTX_CODECS
-#include "qtx/qtxsdk/components.h"
+#include "loader/qtx/qtxsdk/components.h"
 #endif
 
 #ifdef HAVE_ZLIB