diff options
| author | okamstudio <juan@okamstudio.com> | 2014-02-20 23:56:27 -0200 |
|---|---|---|
| committer | okamstudio <juan@okamstudio.com> | 2014-02-20 23:56:27 -0200 |
| commit | 287a6347e66e530350f09f3d66b3ef8e7e868a0b (patch) | |
| tree | 3f13a753866ac2953e9b29e00ac081f431009d69 | |
| parent | 06eb1a3681735026bb35d62572944bff9aab4bf8 (diff) | |
| parent | a17d76e60b8eb76613b654818c932ca1ef2806d2 (diff) | |
Merge pull request #74 from rrockru/master
Fixed build issue on linux (missing webp include path).
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | drivers/webp/dec/decode_vp8.h | 2 | ||||
| -rw-r--r-- | drivers/webp/dec/webp.c | 2 | ||||
| -rw-r--r-- | drivers/webp/mux/demux.c | 6 | ||||
| -rw-r--r-- | drivers/webp/mux/muxi.h | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index c3af322294..de9eed200a 100644 --- a/.gitignore +++ b/.gitignore @@ -73,6 +73,8 @@ bld/ *.VisualState.xml TestResult.xml +*.o +*.a *_i.c *_p.c *_i.h diff --git a/drivers/webp/dec/decode_vp8.h b/drivers/webp/dec/decode_vp8.h index 12c77bcbf6..c26a9fc891 100644 --- a/drivers/webp/dec/decode_vp8.h +++ b/drivers/webp/dec/decode_vp8.h @@ -12,7 +12,7 @@ #ifndef WEBP_WEBP_DECODE_VP8_H_ #define WEBP_WEBP_DECODE_VP8_H_ -#include "../webp/decode.h" +#include "../decode.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/dec/webp.c b/drivers/webp/dec/webp.c index edd348cbe7..f44bc2b8ae 100644 --- a/drivers/webp/dec/webp.c +++ b/drivers/webp/dec/webp.c @@ -14,7 +14,7 @@ #include "./vp8i.h" #include "./vp8li.h" #include "./webpi.h" -#include "../webp/format_constants.h" +#include "../format_constants.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/mux/demux.c b/drivers/webp/mux/demux.c index 4519f7d55b..501d08f41d 100644 --- a/drivers/webp/mux/demux.c +++ b/drivers/webp/mux/demux.c @@ -8,13 +8,13 @@ // WebP container demux. // -#include "../webp/mux.h" +#include "../mux.h" #include <stdlib.h> #include <string.h> -#include "../webp/decode.h" // WebPGetInfo -#include "../webp/format_constants.h" +#include "../decode.h" // WebPGetInfo +#include "../format_constants.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/mux/muxi.h b/drivers/webp/mux/muxi.h index edd8c368cd..2f06f3ed03 100644 --- a/drivers/webp/mux/muxi.h +++ b/drivers/webp/mux/muxi.h @@ -15,8 +15,8 @@ #include <stdlib.h> #include "../dec/vp8i.h" #include "../dec/vp8li.h" -#include "../webp/format_constants.h" -#include "../webp/mux.h" +#include "../format_constants.h" +#include "../mux.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { |