Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
c4fa23a3
Commit
c4fa23a3
authored
Jan 09, 2015
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contribs: openjpeg: Fix windows build
parent
eca862ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
contrib/src/openjpeg/msvc.patch
contrib/src/openjpeg/msvc.patch
+11
-0
contrib/src/openjpeg/rules.mak
contrib/src/openjpeg/rules.mak
+3
-0
No files found.
contrib/src/openjpeg/msvc.patch
0 → 100644
View file @
c4fa23a3
--- 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));
contrib/src/openjpeg/rules.mak
View file @
c4fa23a3
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment