[vlc-commits] contribs: mpcdec: Fix lib copy, regardless of the library's name

Hugo Beauzée-Luyssen git at videolan.org
Wed May 18 19:05:23 CEST 2016


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed May 18 14:20:42 2016 +0200| [5b91b3db6ea8da260a61b659fbd479ec81704932] | committer: Hugo Beauzée-Luyssen

contribs: mpcdec: Fix lib copy, regardless of the library's name

It appears cmake changes its mind about the cross compiled static
libraries, depending on its version.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5b91b3db6ea8da260a61b659fbd479ec81704932
---

 contrib/src/mpcdec/rules.mak |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak
index 72bfc7a..8bb0596 100644
--- a/contrib/src/mpcdec/rules.mak
+++ b/contrib/src/mpcdec/rules.mak
@@ -46,9 +46,6 @@ endif
 	cd $< && $(HOSTVARS_PIC) $(CMAKE) -DSHARED=OFF .
 	cd $< && $(MAKE) install
 	mkdir -p -- "$(PREFIX)/lib"
-ifdef HAVE_WIN32
-	cd $< && cp libmpcdec/mpcdec_static.lib "$(PREFIX)/lib/libmpcdec.a"
-else
-	cd $< && cp libmpcdec/libmpcdec_static.a "$(PREFIX)/lib/libmpcdec.a"
-endif
+	# Use globbing to work around cmake's change of destination file
+	cd $< && cp libmpcdec/*mpcdec_static.* "$(PREFIX)/lib/libmpcdec.a"
 	touch $@



More information about the vlc-commits mailing list