Commit c4844130 authored by Rafaël Carré's avatar Rafaël Carré

contribs: fix lame build on win64

mingw-w64 FORCEINLINE definition includes 'extern'
parent 295594f6
--- 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;
...@@ -10,6 +10,9 @@ $(TARBALLS)/lame-$(LAME_VERSION).tar.gz: ...@@ -10,6 +10,9 @@ $(TARBALLS)/lame-$(LAME_VERSION).tar.gz:
lame: lame-$(LAME_VERSION).tar.gz .sum-lame lame: lame-$(LAME_VERSION).tar.gz .sum-lame
$(UNPACK) $(UNPACK)
ifdef HAVE_WIN64
$(APPLY) $(SRC)/lame/lame-win64.patch
endif
$(MOVE) $(MOVE)
.lame: lame .lame: lame
......
--- 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;
...@@ -872,6 +872,9 @@ lame-$(LAME_VERSION).tar.gz: ...@@ -872,6 +872,9 @@ lame-$(LAME_VERSION).tar.gz:
lame: lame-$(LAME_VERSION).tar.gz lame: lame-$(LAME_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
ifdef HAVE_WIN64
patch -p0 < Patches/lame-win64.patch
endif
.lame: lame .lame: lame
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install)
......
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