vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Fri May 17 13:52:28 
2019 +0200| [4103ffe169e3747f797776b6e994af7d868af503] | committer: Steve Lhomme

win32: package: fix missing files depending on the build configuration

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

 extras/package/win32/msi.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extras/package/win32/msi.mak b/extras/package/win32/msi.mak
index d76ee2ab8b..52c0163699 100644
--- a/extras/package/win32/msi.mak
+++ b/extras/package/win32/msi.mak
@@ -22,8 +22,12 @@ WINE_C=`wine winepath c:`
 heat: package-win-strip
        $(HEAT) dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg 
-sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Plugins.fragment.wxs
        $(HEAT) dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag 
-dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Locale.fragment.wxs
+if BUILD_LUA
        $(HEAT) dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr 
APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Lua.fragment.wxs
+endif
+if BUILD_SKINS
        $(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag 
-dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Skins.fragment.wxs
+endif
 
 candle: heat
        $(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext 
WiXUtilExtension $(W_MSIDIR)\\product.wxs $(W_MSIDIR)\\axvlc.wxs 
$(W_MSIDIR)\\extensions.wxs $(W_MSIBUILDDIR)\\*.fragment.wxs

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to