emile - fix windows build

use evil and fix libjpeg boolean re-def.
This commit is contained in:
Vincent Torri 2018-10-31 14:11:05 +00:00 committed by Carsten Haitzler (Rasterman)
parent 47e6bbb397
commit 41f7ae6e49
1 changed files with 3 additions and 8 deletions

View File

@ -8,6 +8,9 @@
#ifdef _WIN32
#include <winsock2.h>
#include <Evil.h>
#define HAVE_BOOLEAN /* This prevents libjpeg to redefine boolean */
#define XMD_H /* This prevents libjpeg to redefine INT32 */
#endif
#ifdef ENABLE_LIBLZ4
@ -16,19 +19,11 @@
#include "lz4.h"
#endif
#ifdef _WIN32
#define XMD_H /* This prevents libjpeg to redefine INT32 */
#endif
#include <stdio.h>
#include <setjmp.h>
#include <jpeglib.h>
#include <jerror.h>
#ifdef _WIN32
#include <Evil.h>
#endif
#include "rg_etc1.h"
#include "Emile.h"
#include "emile_private.h"