# HG changeset patch
# User diego
# Date 1262637143 0
# Node ID 008338d7679faf45db5a71cbbfccfc381184a49f
# Parent  73458c7f59576938c26cd132dbebbda3c10d8d46
Drop -Iloader from CPPFLAGS for the loader subdirectory.
Instead use full relative paths in #includes.

diff -r 73458c7f5957 -r 008338d7679f Makefile
--- a/Makefile	Mon Jan 04 19:56:28 2010 +0000
+++ b/Makefile	Mon Jan 04 20:32:23 2010 +0000
@@ -885,7 +885,7 @@
 libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
 libfaad2/%:    CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS)
 
-loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
+loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
 #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
 loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN)
 
diff -r 73458c7f5957 -r 008338d7679f loader/dmo/DMO_AudioDecoder.c
--- a/loader/dmo/DMO_AudioDecoder.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dmo/DMO_AudioDecoder.c	Mon Jan 04 20:32:23 2010 +0000
@@ -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 -r 73458c7f5957 -r 008338d7679f loader/dmo/DMO_VideoDecoder.c
--- a/loader/dmo/DMO_VideoDecoder.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dmo/DMO_VideoDecoder.c	Mon Jan 04 20:32:23 2010 +0000
@@ -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 @@
 
 //#include "DMO_VideoDecoder.h"
 
-#include "wine/winerror.h"
+#include "loader/wine/winerror.h"
 
 #include <unistd.h>
 #include <fcntl.h>
diff -r 73458c7f5957 -r 008338d7679f loader/dmo/buffer.c
--- a/loader/dmo/buffer.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dmo/buffer.c	Mon Jan 04 20:32:23 2010 +0000
@@ -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 -r 73458c7f5957 -r 008338d7679f loader/dmo/dmo.c
--- a/loader/dmo/dmo.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dmo/dmo.c	Mon Jan 04 20:32:23 2010 +0000
@@ -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 -r 73458c7f5957 -r 008338d7679f loader/dmo/dmo.h
--- a/loader/dmo/dmo.h	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dmo/dmo.h	Mon Jan 04 20:32:23 2010 +0000
@@ -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 -r 73458c7f5957 -r 008338d7679f loader/dmo/dmo_guids.h
--- a/loader/dmo/dmo_guids.h	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dmo/dmo_guids.h	Mon Jan 04 20:32:23 2010 +0000
@@ -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;
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/DS_AudioDecoder.c
--- a/loader/dshow/DS_AudioDecoder.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/DS_AudioDecoder.c	Mon Jan 04 20:32:23 2010 +0000
@@ -21,7 +21,7 @@
 
 #include "DS_AudioDecoder.h"
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
 #include <string.h>
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/DS_Filter.c
--- a/loader/dshow/DS_Filter.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/DS_Filter.c	Mon Jan 04 20:32:23 2010 +0000
@@ -5,12 +5,12 @@
 
 #include "config.h"
 #include "DS_Filter.h"
-#include "drv.h"
-#include "com.h"
+#include "loader/drv.h"
+#include "loader/com.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "win32.h" // printf macro
+#include "loader/win32.h" // printf macro
 
 typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**);
 
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/DS_VideoDecoder.c
--- a/loader/dshow/DS_VideoDecoder.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/DS_VideoDecoder.c	Mon Jan 04 20:32:23 2010 +0000
@@ -7,7 +7,7 @@
 #include "config.h"
 #include "guids.h"
 #include "interfaces.h"
-#include "registry.h"
+#include "loader/registry.h"
 #include "libwin32.h"
 #include "DS_Filter.h"
 
@@ -30,9 +30,9 @@
 
 #include "DS_VideoDecoder.h"
 
-#include "wine/winerror.h"
+#include "loader/wine/winerror.h"
 #ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 
 #include <unistd.h>
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/allocator.c
--- a/loader/dshow/allocator.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/allocator.c	Mon Jan 04 20:32:23 2010 +0000
@@ -5,8 +5,8 @@
 
 #include "config.h"
 #include "allocator.h"
-#include "com.h"
-#include "wine/winerror.h"
+#include "loader/com.h"
+#include "loader/wine/winerror.h"
 #include <stdio.h>
 #include <stdlib.h>
 
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/cmediasample.c
--- a/loader/dshow/cmediasample.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/cmediasample.c	Mon Jan 04 20:32:23 2010 +0000
@@ -5,7 +5,7 @@
 
 #include "cmediasample.h"
 #include "mediatype.h"
-#include "wine/winerror.h"
+#include "loader/wine/winerror.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/guids.h
--- a/loader/dshow/guids.h	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/guids.h	Mon Jan 04 20:32:23 2010 +0000
@@ -7,13 +7,13 @@
 */
 
 #ifndef GUID_DEFINED
-#include "com.h"
+#include "loader/com.h"
 #endif
 
 #ifndef VFWAPI
-#include "wine/module.h"
-#include "wine/windef.h"
-#include "wine/vfw.h"
+#include "loader/wine/module.h"
+#include "loader/wine/windef.h"
+#include "loader/wine/vfw.h"
 #endif
 
 #include "mediatype.h"
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/inputpin.c
--- a/loader/dshow/inputpin.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/inputpin.c	Mon Jan 04 20:32:23 2010 +0000
@@ -5,7 +5,7 @@
 
 #include "inputpin.h"
 #include "mediatype.h"
-#include "wine/winerror.h"
+#include "loader/wine/winerror.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/interfaces.h
--- a/loader/dshow/interfaces.h	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/interfaces.h	Mon Jan 04 20:32:23 2010 +0000
@@ -8,7 +8,7 @@
  */
 
 #include "iunk.h"
-#include "com.h"
+#include "loader/com.h"
 
 /*    Sh*t. MSVC++ and g++ use different methods of storing vtables.    */
 
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/libwin32.h
--- a/loader/dshow/libwin32.h	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/libwin32.h	Mon Jan 04 20:32:23 2010 +0000
@@ -6,10 +6,10 @@
 #include <inttypes.h>
 
 //#define FATAL(a)  // you don't need exception - if you want - just fill more code
-#include "wine/mmreg.h"
-#include "wine/winreg.h"
-#include "wine/vfw.h"
-#include "com.h"
+#include "loader/wine/mmreg.h"
+#include "loader/wine/winreg.h"
+#include "loader/wine/vfw.h"
+#include "loader/com.h"
 
 typedef uint32_t fourcc_t;
 
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/mediatype.c
--- a/loader/dshow/mediatype.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/mediatype.c	Mon Jan 04 20:32:23 2010 +0000
@@ -22,8 +22,8 @@
  */
 #include "mp_msg.h"
 #include "libmpcodecs/img_format.h"
-#include "wine/winerror.h"
-#include "com.h"
+#include "loader/wine/winerror.h"
+#include "loader/com.h"
 #include "mediatype.h"
 #include "libwin32.h"
 
diff -r 73458c7f5957 -r 008338d7679f loader/dshow/outputpin.c
--- a/loader/dshow/outputpin.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/dshow/outputpin.c	Mon Jan 04 20:32:23 2010 +0000
@@ -3,8 +3,8 @@
  * http://svn.mplayerhq.hu/mplayer/trunk/
  */
 
-#include "wine/winerror.h"
-#include "wine/windef.h"
+#include "loader/wine/winerror.h"
+#include "loader/wine/windef.h"
 #include "outputpin.h"
 #include "mediatype.h"
 #include <stdio.h>
diff -r 73458c7f5957 -r 008338d7679f loader/qtx/list.c
--- a/loader/qtx/list.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/qtx/list.c	Mon Jan 04 20:32:23 2010 +0000
@@ -8,7 +8,7 @@
 
 #include "qtxsdk/components.h"
 #include "qtxsdk/select.h"
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 
 char* get_path(const char* x){  return strdup(x);}
 void* LoadLibraryA(char* name);
diff -r 73458c7f5957 -r 008338d7679f loader/qtx/qtxload.c
--- a/loader/qtx/qtxload.c	Mon Jan 04 19:56:28 2010 +0000
+++ b/loader/qtx/qtxload.c	Mon Jan 04 20:32:23 2010 +0000
@@ -4,7 +4,7 @@
 
 #include "qtxsdk/components.h"
 #include "qtxsdk/select.h"
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #include "mp_msg.h"
 
 /* this is what a plain component looks like */