Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
c4844130
Commit
c4844130
authored
Nov 03, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contribs: fix lame build on win64
mingw-w64 FORCEINLINE definition includes 'extern'
parent
295594f6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
0 deletions
+34
-0
contrib/src/lame/lame-win64.patch
contrib/src/lame/lame-win64.patch
+14
-0
contrib/src/lame/rules.mak
contrib/src/lame/rules.mak
+3
-0
extras/contrib/src/Patches/lame-win64.patch
extras/contrib/src/Patches/lame-win64.patch
+14
-0
extras/contrib/src/contrib-src.mak
extras/contrib/src/contrib-src.mak
+3
-0
No files found.
contrib/src/lame/lame-win64.patch
0 → 100644
View file @
c4844130
--- lame/libmp3lame/vbrquantize.c.orig 2011-11-03 10:26:28.414360800 -0400
+++ lame/libmp3lame/vbrquantize.c 2011-11-03 10:26:30.478371043 -0400
@@ -81,6 +81,11 @@
#define FORCEINLINE
#endif
+#ifdef WIN64
+#undef FORCEINLINE
+#define FORCEINLINE __inline__ __attribute__((always_inline))
+#endif
+
typedef VOLATILE union {
float f;
int i;
contrib/src/lame/rules.mak
View file @
c4844130
...
...
@@ -10,6 +10,9 @@ $(TARBALLS)/lame-$(LAME_VERSION).tar.gz:
lame
:
lame-$(LAME_VERSION).tar.gz .sum-lame
$(UNPACK)
ifdef
HAVE_WIN64
$(APPLY)
$(SRC)
/lame/lame-win64.patch
endif
$(MOVE)
.lame
:
lame
...
...
extras/contrib/src/Patches/lame-win64.patch
0 → 100644
View file @
c4844130
--- lame/libmp3lame/vbrquantize.c.orig 2011-11-03 10:26:28.414360800 -0400
+++ lame/libmp3lame/vbrquantize.c 2011-11-03 10:26:30.478371043 -0400
@@ -81,6 +81,11 @@
#define FORCEINLINE
#endif
+#ifdef WIN64
+#undef FORCEINLINE
+#define FORCEINLINE __inline__ __attribute__((always_inline))
+#endif
+
typedef VOLATILE union {
float f;
int i;
extras/contrib/src/contrib-src.mak
View file @
c4844130
...
...
@@ -872,6 +872,9 @@ lame-$(LAME_VERSION).tar.gz:
lame
:
lame-$(LAME_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef
HAVE_WIN64
patch
-p0
< Patches/lame-win64.patch
endif
.lame
:
lame
(
cd
$<
;
$(HOSTCC)
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
--disable-analyser-hooks
--disable-decoder
--disable-shared
--disable-gtktest
--disable-frontend
&&
make
&&
make
install
)
...
...
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