Browse Source

Fixed build issue on linux (missing webp include path).
Tested on ArchLinux.

rrockru 11 years ago
parent
commit
a17d76e60b
5 changed files with 9 additions and 7 deletions
  1. 2 0
      .gitignore
  2. 1 1
      drivers/webp/dec/decode_vp8.h
  3. 1 1
      drivers/webp/dec/webp.c
  4. 3 3
      drivers/webp/mux/demux.c
  5. 2 2
      drivers/webp/mux/muxi.h

+ 2 - 0
.gitignore

@@ -59,6 +59,8 @@ bld/
 *.VisualState.xml
 TestResult.xml
 
+*.o
+*.a
 *_i.c
 *_p.c
 *_i.h

+ 1 - 1
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" {

+ 1 - 1
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" {

+ 3 - 3
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" {

+ 2 - 2
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" {