# HG changeset patch # User diego # Date 1173998085 0 # Node ID 97343cedd9668e12265c8ff460341a1c86720f7c # Parent 4d81dbdf46b9008eb585868eb50df6568ebe8280 Use explicit path for headers from the loader/ directory. diff -r 4d81dbdf46b9 -r 97343cedd966 libmpdemux/Makefile --- a/libmpdemux/Makefile Thu Mar 15 18:36:36 2007 +0000 +++ b/libmpdemux/Makefile Thu Mar 15 22:34:45 2007 +0000 @@ -65,8 +65,6 @@ 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 diff -r 4d81dbdf46b9 -r 97343cedd966 libmpdemux/demux_avs.c --- a/libmpdemux/demux_avs.c Thu Mar 15 18:36:36 2007 +0000 +++ b/libmpdemux/demux_avs.c Thu Mar 15 22:34:45 2007 +0000 @@ -32,10 +32,10 @@ #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" diff -r 4d81dbdf46b9 -r 97343cedd966 libmpdemux/demux_mkv.c --- a/libmpdemux/demux_mkv.c Thu Mar 15 18:36:36 2007 +0000 +++ b/libmpdemux/demux_mkv.c Thu Mar 15 22:34:45 2007 +0000 @@ -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