[vlc-commits] Contribs: dlopen crystalhd on win32

Jean-Baptiste Kempf git at videolan.org
Fri Dec 2 00:24:07 CET 2011


vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Dec  1 01:30:39 2011 +0100| [207356ea3a1b961f30f4895bd147c7e4d03c517a] | committer: Jean-Baptiste Kempf

Contribs: dlopen crystalhd on win32

And fix unzip behaviour
(cherry picked from commit 3c5709ece3211ed5582e8ecc442fdbf4d5488669)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=207356ea3a1b961f30f4895bd147c7e4d03c517a
---

 contrib/src/crystalhd/rules.mak |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/contrib/src/crystalhd/rules.mak b/contrib/src/crystalhd/rules.mak
index 1da3107..29b0223 100644
--- a/contrib/src/crystalhd/rules.mak
+++ b/contrib/src/crystalhd/rules.mak
@@ -11,6 +11,9 @@ CRYSTAL_SOURCES := crystalhd_lgpl_includes.zip
 
 .crystalhd: $(CRYSTAL_SOURCES) .sum-crystalhd
 	mkdir -p -- "$(PREFIX)/include/libcrystalhd"
-	unzip $< -d "$(PREFIX)/include/libcrystalhd"
+	unzip -o $< -d "$(PREFIX)/include/libcrystalhd"
+ifdef HAVE_WIN32 # we want dlopening on win32
+	rm -rf $(PREFIX)/include/libcrystalhd/bc_drv_if.h
+endif
 	patch -p0 -f -d $(PREFIX)/include/libcrystalhd < ../src/crystalhd/mingw.patch
 	touch $@



More information about the vlc-commits mailing list