summaryrefslogtreecommitdiff
path: root/src/lib/emile
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2018-10-31 14:11:05 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-10-31 14:12:44 +0000
commit41f7ae6e49d6ea5919bfafbb11c894d61dcf1189 (patch)
treed3b4754103f467c9b0e1303955ac1e2a0a5cf4f9 /src/lib/emile
parent47e6bbb3979af692e6c06fc6375c3d0208405e39 (diff)
emile - fix windows build
use evil and fix libjpeg boolean re-def.
Diffstat (limited to 'src/lib/emile')
-rw-r--r--src/lib/emile/emile_image.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/emile/emile_image.c b/src/lib/emile/emile_image.c
index 9f0a3ac18e..3432ccf9c5 100644
--- a/src/lib/emile/emile_image.c
+++ b/src/lib/emile/emile_image.c
@@ -8,6 +8,9 @@
8 8
9#ifdef _WIN32 9#ifdef _WIN32
10#include <winsock2.h> 10#include <winsock2.h>
11#include <Evil.h>
12#define HAVE_BOOLEAN /* This prevents libjpeg to redefine boolean */
13#define XMD_H /* This prevents libjpeg to redefine INT32 */
11#endif 14#endif
12 15
13#ifdef ENABLE_LIBLZ4 16#ifdef ENABLE_LIBLZ4
@@ -16,19 +19,11 @@
16#include "lz4.h" 19#include "lz4.h"
17#endif 20#endif
18 21
19#ifdef _WIN32
20#define XMD_H /* This prevents libjpeg to redefine INT32 */
21#endif
22
23#include <stdio.h> 22#include <stdio.h>
24#include <setjmp.h> 23#include <setjmp.h>
25#include <jpeglib.h> 24#include <jpeglib.h>
26#include <jerror.h> 25#include <jerror.h>
27 26
28#ifdef _WIN32
29#include <Evil.h>
30#endif
31
32#include "rg_etc1.h" 27#include "rg_etc1.h"
33#include "Emile.h" 28#include "Emile.h"
34#include "emile_private.h" 29#include "emile_private.h"