Drop -Iloader from CPPFLAGS for the loader subdirectory.

Instead use full relative paths in #includes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30212 b3059339-0415-0410-9bf9-f77b7e298cf2

6 files changed, 16 insertions, 16 deletions

diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c
index 1b08757349..55a597b2d7 100644
--- a/loader/dmo/DMO_AudioDecoder.c
+++ b/loader/dmo/DMO_AudioDecoder.c
@@ -5,9 +5,9 @@
 
 *********************************************************/
 #include "config.h"
-#include "dshow/libwin32.h"
+#include "loader/dshow/libwin32.h"
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
 #include "DMO_Filter.h"
diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c
index 334acacedf..3dd7098534 100644
--- a/loader/dmo/DMO_VideoDecoder.c
+++ b/loader/dmo/DMO_VideoDecoder.c
@@ -5,14 +5,14 @@
 
 *********************************************************/
 #include "config.h"
-#include "dshow/guids.h"
-#include "dshow/interfaces.h"
-#include "registry.h"
+#include "loader/dshow/guids.h"
+#include "loader/dshow/interfaces.h"
+#include "loader/registry.h"
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
-#include "dshow/libwin32.h"
+#include "loader/dshow/libwin32.h"
 #include "DMO_Filter.h"
 
 #include "DMO_VideoDecoder.h"
@@ -33,7 +33,7 @@ struct DMO_VideoDecoder
 
 //#include "DMO_VideoDecoder.h"
 
-#include "wine/winerror.h"
+#include "loader/wine/winerror.h"
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/loader/dmo/buffer.c b/loader/dmo/buffer.c
index 0a74fe6c8a..70883b9abe 100644
--- a/loader/dmo/buffer.c
+++ b/loader/dmo/buffer.c
@@ -1,7 +1,7 @@
 #include "DMO_Filter.h"
 
-#include "wine/winerror.h"
-#include "wine/windef.h"
+#include "loader/wine/winerror.h"
+#include "loader/wine/windef.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/loader/dmo/dmo.c b/loader/dmo/dmo.c
index 0e4d2a45e4..f8898efcb5 100644
--- a/loader/dmo/dmo.c
+++ b/loader/dmo/dmo.c
@@ -5,12 +5,12 @@
 
 #include "config.h"
 #include "DMO_Filter.h"
-#include "drv.h"
-#include "com.h"
+#include "loader/drv.h"
+#include "loader/com.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "win32.h" // printf macro
+#include "loader/win32.h" // printf macro
 
 void trapbug(void);
 typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**);
diff --git a/loader/dmo/dmo.h b/loader/dmo/dmo.h
index b6eeb7410e..dc96bb3326 100644
--- a/loader/dmo/dmo.h
+++ b/loader/dmo/dmo.h
@@ -9,8 +9,8 @@
  *
  */
 
-#include "dshow/iunk.h"
-#include "dshow/guids.h"
+#include "loader/dshow/iunk.h"
+#include "loader/dshow/guids.h"
 
 typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE;
 
diff --git a/loader/dmo/dmo_guids.h b/loader/dmo/dmo_guids.h
index 51e93c9a2c..084c501c5a 100644
--- a/loader/dmo/dmo_guids.h
+++ b/loader/dmo/dmo_guids.h
@@ -1,7 +1,7 @@
 #ifndef MPLAYER_DMO_GUIDS_H
 #define MPLAYER_DMO_GUIDS_H
 
-#include "dshow/guids.h"
+#include "loader/dshow/guids.h"
 
 extern const GUID IID_IMediaBuffer;
 extern const GUID IID_IMediaObject;