diff options
Diffstat (limited to 'extern/libopenjpeg')
| -rw-r--r-- | extern/libopenjpeg/SConscript | 4 | ||||
| -rw-r--r-- | extern/libopenjpeg/opj_includes.h | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript index a27ac0d13df..13a34bf5598 100644 --- a/extern/libopenjpeg/SConscript +++ b/extern/libopenjpeg/SConscript @@ -24,5 +24,5 @@ if not env['OURPLATFORM'] == 'win32-vc': oj_env.BlenderLib ( libname='extern_openjpeg', sources=sources, includes=Split(incs), defines=defs, - libtype=['core','intern','player'], - priority=[300, 300, 300], compileflags = flags) + libtype=['extern'], + priority=[10], compileflags = flags) diff --git a/extern/libopenjpeg/opj_includes.h b/extern/libopenjpeg/opj_includes.h index 80d43df990f..3464cfcf9ed 100644 --- a/extern/libopenjpeg/opj_includes.h +++ b/extern/libopenjpeg/opj_includes.h @@ -88,6 +88,12 @@ Most compilers implement their own version of this keyword ... /* MSVC does not have lrintf */ #ifdef _MSC_VER +#ifdef _M_X64 +#include <emmintrin.h> +static INLINE long lrintf(float f) { + return _mm_cvtss_si32(_mm_load_ss(&f)); +} +#else static INLINE long lrintf(float f){ int i; @@ -99,6 +105,7 @@ static INLINE long lrintf(float f){ return i; } #endif +#endif #include "j2k_lib.h" #include "opj_malloc.h" |