diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-04 20:32:23 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-04 20:32:23 +0000 |
commit | a4ce4a23b7a74229e12930c68d182a698976305a (patch) | |
tree | c896ac7bb989b3c777277f9360b7e85a9a68bc12 /loader | |
parent | cdcbe65d478491a33cced1fce0fc6dc89ec2d210 (diff) | |
download | mpv-a4ce4a23b7a74229e12930c68d182a698976305a.tar.bz2 mpv-a4ce4a23b7a74229e12930c68d182a698976305a.tar.xz |
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
Diffstat (limited to 'loader')
-rw-r--r-- | loader/dmo/DMO_AudioDecoder.c | 4 | ||||
-rw-r--r-- | loader/dmo/DMO_VideoDecoder.c | 12 | ||||
-rw-r--r-- | loader/dmo/buffer.c | 4 | ||||
-rw-r--r-- | loader/dmo/dmo.c | 6 | ||||
-rw-r--r-- | loader/dmo/dmo.h | 4 | ||||
-rw-r--r-- | loader/dmo/dmo_guids.h | 2 | ||||
-rw-r--r-- | loader/dshow/DS_AudioDecoder.c | 2 | ||||
-rw-r--r-- | loader/dshow/DS_Filter.c | 6 | ||||
-rw-r--r-- | loader/dshow/DS_VideoDecoder.c | 6 | ||||
-rw-r--r-- | loader/dshow/allocator.c | 4 | ||||
-rw-r--r-- | loader/dshow/cmediasample.c | 2 | ||||
-rw-r--r-- | loader/dshow/guids.h | 8 | ||||
-rw-r--r-- | loader/dshow/inputpin.c | 2 | ||||
-rw-r--r-- | loader/dshow/interfaces.h | 2 | ||||
-rw-r--r-- | loader/dshow/libwin32.h | 8 | ||||
-rw-r--r-- | loader/dshow/mediatype.c | 4 | ||||
-rw-r--r-- | loader/dshow/outputpin.c | 4 | ||||
-rw-r--r-- | loader/qtx/list.c | 2 | ||||
-rw-r--r-- | loader/qtx/qtxload.c | 2 |
19 files changed, 42 insertions, 42 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; diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c index b18b646160..cfa2fcb5a2 100644 --- a/loader/dshow/DS_AudioDecoder.c +++ b/loader/dshow/DS_AudioDecoder.c @@ -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> diff --git a/loader/dshow/DS_Filter.c b/loader/dshow/DS_Filter.c index 5fb1ec73dc..42b47b8626 100644 --- a/loader/dshow/DS_Filter.c +++ b/loader/dshow/DS_Filter.c @@ -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 --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index 7f5c8994ad..130e31c07a 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -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> diff --git a/loader/dshow/allocator.c b/loader/dshow/allocator.c index 3e0deabceb..8ead279a37 100644 --- a/loader/dshow/allocator.c +++ b/loader/dshow/allocator.c @@ -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 --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c index 98a864b3be..c594bae787 100644 --- a/loader/dshow/cmediasample.c +++ b/loader/dshow/cmediasample.c @@ -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 --git a/loader/dshow/guids.h b/loader/dshow/guids.h index 5666ec3041..5bf335f907 100644 --- a/loader/dshow/guids.h +++ b/loader/dshow/guids.h @@ -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" diff --git a/loader/dshow/inputpin.c b/loader/dshow/inputpin.c index 37d9f758fa..5c9b832f7a 100644 --- a/loader/dshow/inputpin.c +++ b/loader/dshow/inputpin.c @@ -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 --git a/loader/dshow/interfaces.h b/loader/dshow/interfaces.h index 8cac9712b8..5c927a55be 100644 --- a/loader/dshow/interfaces.h +++ b/loader/dshow/interfaces.h @@ -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 --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h index 70d5e0f006..dd25c31941 100644 --- a/loader/dshow/libwin32.h +++ b/loader/dshow/libwin32.h @@ -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 --git a/loader/dshow/mediatype.c b/loader/dshow/mediatype.c index d6597fa767..873c303477 100644 --- a/loader/dshow/mediatype.c +++ b/loader/dshow/mediatype.c @@ -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 --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c index d876f4401f..c24c29efb3 100644 --- a/loader/dshow/outputpin.c +++ b/loader/dshow/outputpin.c @@ -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 --git a/loader/qtx/list.c b/loader/qtx/list.c index 0140f9b954..8c1ea6abe2 100644 --- a/loader/qtx/list.c +++ b/loader/qtx/list.c @@ -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 --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c index fe95ac87a5..029fad2881 100644 --- a/loader/qtx/qtxload.c +++ b/loader/qtx/qtxload.c @@ -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 */ |