Commit c4fa23a3 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

contribs: openjpeg: Fix windows build

parent eca862ff
--- openjpeg/libopenjpeg/opj_includes.h 2012-02-07 11:49:55.000000000 +0100
+++ /home/vlc/vlc/contrib/windowsphone/openjpeg/libopenjpeg/opj_includes.h 2014-12-15 16:54:31.303058600 +0100
@@ -87,7 +87,7 @@
#endif
/* MSVC and Borland C do not have lrintf */
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if (defined(_MSC_VER) && _MSC_VER < 1800) || defined(__BORLANDC__)
static INLINE long lrintf(float f){
#ifdef _M_X64
return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
......@@ -11,6 +11,9 @@ $(TARBALLS)/openjpeg-$(OPENJPEG_VERSION).tar.gz:
openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz .sum-openjpeg
$(UNPACK)
$(APPLY) $(SRC)/openjpeg/freebsd.patch
ifdef HAVE_VISUALSTUDIO
$(APPLY) $(SRC)/openjpeg/msvc.patch
endif
$(UPDATE_AUTOCONFIG)
$(MOVE)
......
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