cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
fi ; \
done
- if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \
+ if test -d $(CONTRIB_DIR)/vlc-lib ; then \
mkdir -p $(top_builddir)/vlc-bundle/lib ; \
- for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \
+ for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \
cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
done ; \
fi
ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
if HAVE_DARWIN
-if BUILD_VLC
+if BUILD_MACOSX_VLC_APP
# Create the MacOS X app
noinst_DATA = VLC.app
endif
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
- cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
+ cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
mkdir -p $(top_builddir)/tmp/modules/audio_output
mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done
mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
- cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
+ cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
mkdir -p $(top_builddir)/tmp/modules/audio_output
mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
# Copy Text files
- for file in AUTHORS MAINTAINERS THANKS ; \
+ for file in AUTHORS THANKS ; \
do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done;
for file in NEWS COPYING README; \
do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done
fi ; done
# Contrib *.dll's
- cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true
+# cp $(CONTRIB_DIR)/lib/*.dll "vlc-$(VERSION)/" || true
#Enable DEP and ASLR for all the binaries
if USE_PEFLAGS
unix2dos $(win32_lua_destdir)/http/*.css
cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/
unix2dos $(win32_lua_destdir)/http/js/*.js
+ cp $(srcdir)/share/lua/http/*.lua $(win32_lua_destdir)/http/
+ unix2dos $(win32_lua_destdir)/http/*.lua
cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/
unix2dos $(win32_lua_destdir)/http/dialogs/*
cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/
echo "OK."; mkdir -p "$(win32_debugdir)"; \
fi
for i in "" $(win32_destdir)/*$(LIBEXT) \
+ $(win32_destdir)/activex/*$(LIBEXT) \
+ $(win32_destdir)/mozilla/*$(LIBEXT) \
$(win32_destdir)/plugins/*$(LIBEXT) \
; do \
if test -n "$$i" ; then \
else \
echo 'Error: cannot locate makensis tool'; exit 1; \
fi; \
- eval "$$MAKENSIS $(win32_destdir)/spad.nsi"
+ eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \
eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi"
package-win32-base-zip: package-win32-base