Author: diego
Date: Mon Jan 4 21:32:23 2010
New Revision: 30212
Log:
Drop -Iloader from CPPFLAGS for the loader subdirectory.
Instead use full relative paths in #includes.
Modified:
trunk/Makefile
trunk/loader/dmo/DMO_AudioDecoder.c
trunk/loader/dmo/DMO_VideoDecoder.c
trunk/loader/dmo/buffer.c
trunk/loader/dmo/dmo.c
trunk/loader/dmo/dmo.h
trunk/loader/dmo/dmo_guids.h
trunk/loader/dshow/DS_AudioDecoder.c
trunk/loader/dshow/DS_Filter.c
trunk/loader/dshow/DS_VideoDecoder.c
trunk/loader/dshow/allocator.c
trunk/loader/dshow/cmediasample.c
trunk/loader/dshow/guids.h
trunk/loader/dshow/inputpin.c
trunk/loader/dshow/interfaces.h
trunk/loader/dshow/libwin32.h
trunk/loader/dshow/mediatype.c
trunk/loader/dshow/outputpin.c
trunk/loader/qtx/list.c
trunk/loader/qtx/qtxload.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/Makefile Mon Jan 4 21:32:23 2010 (r30212)
@@ -885,7 +885,7 @@ libdvdnav/%: CFLAGS := -Ilibdvdnav -D_
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)
Modified: trunk/loader/dmo/DMO_AudioDecoder.c
==============================================================================
--- trunk/loader/dmo/DMO_AudioDecoder.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dmo/DMO_AudioDecoder.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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"
Modified: trunk/loader/dmo/DMO_VideoDecoder.c
==============================================================================
--- trunk/loader/dmo/DMO_VideoDecoder.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dmo/DMO_VideoDecoder.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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>
Modified: trunk/loader/dmo/buffer.c
==============================================================================
--- trunk/loader/dmo/buffer.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dmo/buffer.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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>
Modified: trunk/loader/dmo/dmo.c
==============================================================================
--- trunk/loader/dmo/dmo.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dmo/dmo.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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**);
Modified: trunk/loader/dmo/dmo.h
==============================================================================
--- trunk/loader/dmo/dmo.h Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dmo/dmo.h Mon Jan 4 21:32:23 2010 (r30212)
@@ -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;
Modified: trunk/loader/dmo/dmo_guids.h
==============================================================================
--- trunk/loader/dmo/dmo_guids.h Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dmo/dmo_guids.h Mon Jan 4 21:32:23 2010 (r30212)
@@ -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;
Modified: trunk/loader/dshow/DS_AudioDecoder.c
==============================================================================
--- trunk/loader/dshow/DS_AudioDecoder.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/DS_AudioDecoder.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -21,7 +21,7 @@ struct DS_AudioDecoder
#include "DS_AudioDecoder.h"
#ifdef WIN32_LOADER
-#include "ldt_keeper.h"
+#include "loader/ldt_keeper.h"
#endif
#include <string.h>
Modified: trunk/loader/dshow/DS_Filter.c
==============================================================================
--- trunk/loader/dshow/DS_Filter.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/DS_Filter.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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**);
Modified: trunk/loader/dshow/DS_VideoDecoder.c
==============================================================================
--- trunk/loader/dshow/DS_VideoDecoder.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/DS_VideoDecoder.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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 @@ static SampleProcUserData sampleProcData
#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>
Modified: trunk/loader/dshow/allocator.c
==============================================================================
--- trunk/loader/dshow/allocator.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/allocator.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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>
Modified: trunk/loader/dshow/cmediasample.c
==============================================================================
--- trunk/loader/dshow/cmediasample.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/cmediasample.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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>
Modified: trunk/loader/dshow/guids.h
==============================================================================
--- trunk/loader/dshow/guids.h Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/guids.h Mon Jan 4 21:32:23 2010 (r30212)
@@ -7,13 +7,13 @@ under MinGW
*/
#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"
Modified: trunk/loader/dshow/inputpin.c
==============================================================================
--- trunk/loader/dshow/inputpin.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/inputpin.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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>
Modified: trunk/loader/dshow/interfaces.h
==============================================================================
--- trunk/loader/dshow/interfaces.h Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/interfaces.h Mon Jan 4 21:32:23 2010 (r30212)
@@ -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. */
Modified: trunk/loader/dshow/libwin32.h
==============================================================================
--- trunk/loader/dshow/libwin32.h Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/libwin32.h Mon Jan 4 21:32:23 2010 (r30212)
@@ -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;
Modified: trunk/loader/dshow/mediatype.c
==============================================================================
--- trunk/loader/dshow/mediatype.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/mediatype.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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"
Modified: trunk/loader/dshow/outputpin.c
==============================================================================
--- trunk/loader/dshow/outputpin.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/dshow/outputpin.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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>
Modified: trunk/loader/qtx/list.c
==============================================================================
--- trunk/loader/qtx/list.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/qtx/list.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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);
Modified: trunk/loader/qtx/qtxload.c
==============================================================================
--- trunk/loader/qtx/qtxload.c Mon Jan 4 20:56:28 2010 (r30211)
+++ trunk/loader/qtx/qtxload.c Mon Jan 4 21:32:23 2010 (r30212)
@@ -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 */