Commit 614364f1 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Update libjpeg-turbo

parent 11f1c230
......@@ -2,8 +2,8 @@ SET(PREFIX_ext_jpeg "${EXTPREFIX}" )
if (MSVC OR MINGW)
ExternalProject_Add( ext_jpeg
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.5.0.tar.gz
URL_MD5 3fc5d9b6a8bce96161659ae7a9939257
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.5.3.tar.gz
URL_MD5 7c82f0f6a3130ec06b8a4d0b321cbca3
INSTALL_DIR ${PREFIX_ext_jpeg}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_jpeg} -DWITH_SIMD=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
......@@ -13,8 +13,8 @@ ExternalProject_Add( ext_jpeg
else()
ExternalProject_Add( ext_jpeg
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.5.0.tar.gz
URL_MD5 3fc5d9b6a8bce96161659ae7a9939257
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.5.3.tar.gz
URL_MD5 7c82f0f6a3130ec06b8a4d0b321cbca3
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_jpeg} ${GLOBAL_AUTOMAKE_PROFILE} --without-simd
BUILD_COMMAND make
......
This diff is collapsed.
diff --git a/jconfig.cfg b/jconfig.cfg
index c4548fc..6e5d2dc 100644
--- a/jconfig.cfg
+++ b/jconfig.cfg
@@ -18,8 +18,7 @@
#undef INCOMPLETE_TYPES_BROKEN
/* Define "boolean" as unsigned char, not enum, on Windows systems. */
-#ifdef _WIN32
-#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
+#ifndef boolean /* don't conflict if rpcndr.h already read */
typedef unsigned char boolean;
#endif
#ifndef FALSE /* in case these macros already exist */
@@ -29,7 +28,6 @@ typedef unsigned char boolean;
#define TRUE 1
#endif
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
-#endif
#ifdef JPEG_INTERNALS
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment