From a5dfed5d43cfec4e708fe074e306b7e419326914 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 14 Oct 2014 14:51:17 +0200 Subject: [PATCH] Enable KDU 7.5.0 to make a build across all platforms. --- autobuild.xml | 12 ++++++------ indra/llkdu/llimagej2ckdu.h | 4 +--- indra/llkdu/llkdumem.h | 4 +--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 85182dfd0f..caf3c8d87d 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1418,9 +1418,9 @@ archive hash - f5a09d25b38c251bc880121f6ca1c857 + 08488ce3107c4d30fd61a5bd332496d6 url - file:///opt/firestorm/kdu-7.4.0-darwin-20140605.tar.bz2 + file:///opt/firestorm/kdu-7.5.0-darwin-20141007.tar.bz2 name darwin @@ -1430,9 +1430,9 @@ archive hash - ae5e86bbe3376d107960e1364cada76a + 1310525b07b37fb6c869ba1af24425ce url - file:///opt/firestorm/kdu-7.4.0-linux-20140605.tar.bz2 + file:///opt/firestorm/kdu-7.5.0-linux-20141007.tar.bz2 name linux @@ -1454,9 +1454,9 @@ archive hash - 3c2d8f82e75cab399dbe9eff7c3038f6 + aceaedb0d73e98a6a01352d8df7c64e3 url - file:///c:/cygwin/opt/firestorm/kdu-7.4.0-windows-20140605.tar.bz2 + file:///c:/cygwin/opt/firestorm/kdu-7.5.0-windows-20141013.tar.bz2 name windows diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index 06bbcf66d0..c8a8531b75 100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -35,9 +35,7 @@ #define KDU_NO_THREADS // Some magic to make KDU and the viewer agree with internal alignments -#if KDU_MAJOR_VERSION >= 7 && KDU_MINOR_VERSION >= 5 - #define KDU_X86_INTRINSICS -#endif +#define KDU_X86_INTRINSICS // #include "kdu_elementary.h" diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index 5ab0916775..8216ac2144 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -41,9 +41,7 @@ #define KDU_NO_THREADS // Some magic to make KDU and the viewer agree with internal alignments -#if KDU_MAJOR_VERSION >= 7 && KDU_MINOR_VERSION >= 5 - #define KDU_X86_INTRINSICS -#endif +#define KDU_X86_INTRINSICS // #include "kdu_image.h"