[vlc-devel] [PATCH] automatically remove unneeded Qt/lua binaries from the downloaded win32 prebuilt contrib

[Steve Lhomme]

Same patch but removing the previous folder before copying.

---
 contrib/src/main.mak | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 731e604..86323c2 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -384,6 +384,12 @@ vlc-contrib-$(HOST)-latest.tar.bz2:

 prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
     -$(UNPACK)
+ifdef HAVE_WIN32
+ifndef HAVE_CROSS_COMPILE
+    $(RM) $(HOST)/bin/moc $(HOST)/bin/uic $(HOST)/bin/rcc $(HOST)/bin/luac
+    $(RM) -r $(TOPDST)/$(HOST)
+endif
+endif
     mv $(HOST) $(TOPDST)
     cd $(TOPDST)/$(HOST) && $(SRC)/change_prefix.sh

-- 
1.9.5.msysgit.0



On Tue, Feb 17, 2015 at 2:42 PM, Steve Lhomme <robux4 at gmail.com> wrote:

> To avoid the last line from this tutorial
>
> https://wiki.videolan.org/Win32CompileMSYS/#Get_precompiled_3rd_party_libraries
>
> ---
>  contrib/src/main.mak | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> index 731e604..1478810 100644
> --- a/contrib/src/main.mak
> +++ b/contrib/src/main.mak
> @@ -384,6 +384,11 @@ vlc-contrib-$(HOST)-latest.tar.bz2:
>
>  prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
>      -$(UNPACK)
> +ifdef HAVE_WIN32
> +ifndef HAVE_CROSS_COMPILE
> +    $(RM) $(HOST)/bin/moc $(HOST)/bin/uic $(HOST)/bin/rcc $(HOST)/bin/luac
> +endif
> +endif
>      mv $(HOST) $(TOPDST)
>      cd $(TOPDST)/$(HOST) && $(SRC)/change_prefix.sh
>
> --
> 1.9.5.msysgit.0
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20150217/b0396546/attachment.html>