godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74 from rrockru/master 

Fixed build issue on linux (missing webp include path).
This commit is contained in:
okamstudio 2014-02-20 23:56:27 -02:00
parent 06eb1a3681 a17d76e60b
commit 287a6347e6
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

2
drivers/webp/dec/decode_vp8.h
View File

@ -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" {

2
drivers/webp/dec/webp.c
View File

@ -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" {

6
drivers/webp/mux/demux.c
View File

@ -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" {

4
drivers/webp/mux/muxi.h
View File

@ -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" {