Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
456
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
b3746a09
Commit
b3746a09
authored
10 years ago
by
Hugo Beauzée-Luyssen
Browse files
Options
Downloads
Patches
Plain Diff
contribs: vorbis: Fix msvc build
parent
8a049b80
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/vorbis/msvc.patch
+11
-0
11 additions, 0 deletions
contrib/src/vorbis/msvc.patch
contrib/src/vorbis/rules.mak
+3
-0
3 additions, 0 deletions
contrib/src/vorbis/rules.mak
with
14 additions
and
0 deletions
contrib/src/vorbis/msvc.patch
0 → 100644
+
11
−
0
View file @
b3746a09
--- libvorbis/lib/os.h 2014-01-22 10:53:32.000000000 +0100
+++ /home/vlc/vlc/contrib/windowsphone/libvorbis/lib/os.h 2014-12-15 16:54:46.588645600 +0100
@@ -120,7 +120,7 @@
/* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the
* 64 bit compiler */
-#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE)
+#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE) && !defined(_M_ARM)
# define VORBIS_FPU_CONTROL
typedef ogg_int16_t vorbis_fpu_control;
This diff is collapsed.
Click to expand it.
contrib/src/vorbis/rules.mak
+
3
−
0
View file @
b3746a09
...
...
@@ -26,6 +26,9 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
libvorbis
:
libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
$(
UNPACK
)
$(
APPLY
)
$(
SRC
)
/vorbis/osx.patch
ifdef
HAVE_VISUALSTUDIO
$(
APPLY
)
$(
SRC
)
/vorbis/msvc.patch
endif
$(
UPDATE_AUTOCONFIG
)
$(
MOVE
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment