# SUBDIRS stores the directories where a "make" is required when building
# something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information.
-# - src (libvlc) is nedeed by modules, mozilla and bindings
+# - src (libvlc) is nedeed by modules
# - libs/* are needed by modules
BASE_SUBDIRS = po compat src bin modules share doc test
-EXTRA_SUBDIRS = m4 extras/package/ipkg \
- libs/loader libs/srtp libs/unzip \
- projects/mozilla projects/activex
+EXTRA_SUBDIRS = m4 \
+ libs/loader libs/srtp libs/unzip
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
SUBDIRS = po compat src
SUBDIRS += bin
endif
SUBDIRS += modules share doc test
-if BUILD_MOZILLA
-SUBDIRS += projects/mozilla
-endif
-if BUILD_ACTIVEX
-SUBDIRS += projects/activex
-endif
EXTRA_DIST = \
HACKING \
INSTALL.win32 \
- INSTALL.wince \
extras/package/win32/vlc.exe.manifest \
extras/package/win32/libvlc.dll.manifest \
extras/package/macosx/README.MacOSX.rtf \
extras/package/win32/languages/sorani.nsh \
extras/package/win32/languages/spanish.nsh
-dist_noinst_SCRIPTS = bootstrap toolbox
+dist_noinst_SCRIPTS = bootstrap
nodist_noinst_SCRIPTS = compile
-BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi
+BUILT_SOURCES_distclean = vlc-config
+if HAVE_WIN32
+BUILT_SOURCES_distclean += \
+ extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi
+endif
if HAVE_DARWIN
BUILT_SOURCES_clean = macosx-sdk
else
--disable-faad --disable-skins2 \
--disable-live555 \
--disable-fribidi --disable-glx \
+ --disable-mkv \
--with-kde-solid='$${datadir}/kde4/apps'
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = \
- 1.9 \
+ 1.11 \
-Wall \
check-news \
- dist-bzip2 \
+ dist-xz \
no-dist-gzip
# std-options
extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \
extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \
extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
- extras/package/macosx/plugin/Info.plist.in \
- extras/package/macosx/plugin/InstallerInfo.plist.in \
- extras/package/macosx/plugin/InstallerDescription.plist \
- extras/package/macosx/plugin/pbdevelopment.plist \
extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
extras/package/macosx/eyetvplugin/Info.plist \
extras/package/macosx/eyetvplugin/eyetvplugin.c \
extras/misc/mpris.py \
extras/misc/mpris.glade
-dist-hook:
- distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
-
###############################################################################
# Building libvlc
###############################################################################
.PHONY: libvlc core doc
-if HAVE_BEOS
-noinst_DATA = vlc-bundle
-vlc-bundle: vlc
- rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
- cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
- xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
- for i in "" `$(VLC_CONFIG) --target plugin` ; do \
- if test -n "$$i" ; then \
- mkdir -p $(top_builddir)/vlc-bundle/plugins ; \
- cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
- fi ; \
- done
- if test -d $(CONTRIB_DIR)/vlc-lib ; then \
- mkdir -p $(top_builddir)/vlc-bundle/lib ; \
- for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \
- cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
- done ; \
- fi
- cat $(top_srcdir)/po/LINGUAS | while read i; do \
- mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \
- cp "$(top_builddir)/po/$$i.gmo" \
- "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
- done
- find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
-endif
-
###############################################################################
# Building aliases
###############################################################################
$(top_builddir)/tmp/modules/gui/macosx; \
done
$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
- xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+ xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
cd ../../../../ && \
cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
rm -Rf $(top_builddir)/tmp
for i in $(srcdir)/share/lua/http/requests/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \
done
- $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/readme.txt
+ $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/README.txt
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images
for i in $(srcdir)/share/http/requests/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
done
- $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
+ $(INSTALL) -m 644 $(srcdir)/share/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/README.txt
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
$(top_builddir)/tmp/modules/gui/macosx; \
done
$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
- xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+ xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
cd ../../../../ && \
cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
############################################################################
## Win ##
############################################################################
+destdir=$(prefix)
win32_destdir=$(top_builddir)/vlc-$(VERSION)
-win32_xpi_destdir=$(win32_destdir)/vlc-plugin
win32_debugdir=$(top_builddir)/symbols-$(VERSION)
-npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)
-axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT)
-win32_lua_destdir=$(win32_destdir)/lua
-win32_http_destdir=$(win32_destdir)/http
-destdir=_win32
-
-#Win-common if for win32 and wince
-package-win-common:
+win32_xpi_destdir=$(win32_destdir)/vlc-plugin
+
+if HAVE_WIN64
+build-npapi:
+ touch $@
+
+build-activex:
+ touch $@
+else
+if HAVE_WINCE
+build-npapi:
+ touch $@
+
+build-activex:
+ touch $@
+else
+if HAVE_WIN32
+include extras/package/npapi.am
+include extras/package/activex.am
+endif
+endif
+endif
+
+#Win-common is for win32 and wince
+package-win-common: install build-npapi build-activex
# Check that tmp isn't in the way
@if test -e "$(win32_destdir)"; then \
echo "Error: please remove $(win32_destdir), it is in the way"; \
echo "Error: please remove $(win32_debugdir), it is in the way"; \
false; \
else \
- echo "OK."; mkdir -p "$(win32_debugdir)"; \
- echo "OK."; mkdir -p "$(win32_destdir)"; \
+ echo "Debug dir OK."; mkdir -p "$(win32_debugdir)"; \
+ echo "Dest dir OK."; mkdir -p "$(win32_destdir)"; \
fi
-# Copy relevant files
-# Copy executables, major libs+manifests
- for file in $(destdir)/bin/vlc$(EXEEXT) $(destdir)/bin/libvlc$(LIBEXT) \
- $(destdir)/bin/libvlccore$(LIBEXT) $(destdir)/lib/vlc/vlc-cache-gen$(EXEEXT) \
- $(top_srcdir)/extras/package/win32/vlc$(EXEEXT).manifest \
+# Executables, major libs+manifests
+ find $(destdir) -maxdepth 4 \( -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" \) -exec cp {} "$(win32_destdir)/" \;
+ for file in $(top_srcdir)/extras/package/win32/vlc$(EXEEXT).manifest \
$(top_srcdir)/extras/package/win32/libvlc$(LIBEXT).manifest; \
do cp $$file "$(win32_destdir)/" ; done;
-# Copy Text files
+# Text files and clean them
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
- $(U2D) "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
-# Necessary icons
- cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)/
-# Copy the locales
- cp -r $(destdir)/share/locale $(win32_destdir)
-
-# Mozilla plugin
-if BUILD_MOZILLA
- mkdir -p "$(win32_destdir)/mozilla"
- cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
- cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
-endif
-# ActiveX plugin
-if BUILD_ACTIVEX
- mkdir -p "$(win32_destdir)/activex"
- cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/activex/
- cp $(srcdir)/projects/activex/test.html $(win32_destdir)/activex/
- $(U2D) $(win32_destdir)/activex/*
- cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
- cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
-endif
+# Necessary icon
+ cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)
-# Rebase all those DLLs to speed up loading (need cygwin rebase)
- if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
- find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
- fi
-
-# Copy the UAC NSIS plugin
- mkdir -p "$(win32_destdir)/NSIS"
- cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS"
- cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS"
-
-prepare-win32-web-plugin: package-win-common-strip
- mkdir -p "$(win32_xpi_destdir)/plugins"
- cp $(win32_destdir)/mozilla/npvlc$(LIBEXT) \
- "$(win32_xpi_destdir)/plugins"
- cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest \
- "$(win32_xpi_destdir)/plugins"
- cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" \
- "$(win32_xpi_destdir)/plugins"
- cp "$(win32_destdir)/libvlccore$(LIBEXT)" \
- "$(win32_xpi_destdir)/plugins"
- cp "$(win32_destdir)/libvlc$(LIBEXT)" \
- "$(win32_xpi_destdir)/plugins"
- mkdir -p "$(win32_xpi_destdir)/plugins/plugins"
- cp $(win32_destdir)/plugins/*$(LIBEXT) \
- "$(win32_xpi_destdir)/plugins/plugins"
- rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"
- rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"
-package-win32-xpi: prepare-win32-web-plugin
- cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
- cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" \
- install.rdf plugins
-
-package-win32-crx: prepare-win32-web-plugin
- cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)"
- crxmake --pack-extension "$(win32_xpi_destdir)" \
- --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" \
- --ignore-file install.rdf
-
-package-win32-base-debug: package-win-common
-# Copy relevant files
-# Script installer
- cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
- cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/"
- mkdir "$(win32_destdir)/languages"
- cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/"
+# Locales
+ -cp -r $(destdir)/share/locale $(win32_destdir)
# Plugins
- mkdir -p "$(win32_destdir)/plugins"
- find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
- if test -n "$$i" ; then \
- $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
- fi ; done
-
-#Enable DEP and ASLR for all the binaries
-if USE_PEFLAGS
- find $(win32_destdir) -type f -name '*.dll' -print -o -name '*.exe' -print | while read i; do \
- $(PEFLAGS) --dynamicbase=true --nxcompat=true "$$i" ; \
- done
-endif
+ cp -r $(destdir)/lib/vlc/plugins $(win32_destdir)
if BUILD_LUA
-# Copy the lua scripts (HTTP)
- mkdir -p "$(win32_lua_destdir)/http/images"
- mkdir -p "$(win32_lua_destdir)/http/requests"
- mkdir -p "$(win32_lua_destdir)/http/js"
- mkdir -p "$(win32_lua_destdir)/http/dialogs"
- cp $(srcdir)/share/lua/http/*.html $(win32_lua_destdir)/http/
- $(U2D) $(win32_lua_destdir)/http/*.html
- cp $(srcdir)/share/lua/http/.hosts $(win32_lua_destdir)/http/
- $(U2D) $(win32_lua_destdir)/http/.hosts
- cp $(srcdir)/share/lua/http/*.css $(win32_lua_destdir)/http/
- $(U2D) $(win32_lua_destdir)/http/*.css
- cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/
- $(U2D) $(win32_lua_destdir)/http/js/*.js
- cp $(srcdir)/share/lua/http/*.lua $(win32_lua_destdir)/http/
- $(U2D) $(win32_lua_destdir)/http/*.lua
- cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/
- $(U2D) $(win32_lua_destdir)/http/dialogs/*
- cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/
- $(U2D) $(win32_lua_destdir)/http/dialogs/.hosts
- cp $(srcdir)/share/lua/http/*.ico $(win32_lua_destdir)/http/
- cp $(srcdir)/share/lua/http/images/*.png $(win32_lua_destdir)/http/images/
- cp $(srcdir)/share/lua/http/requests/*.xml $(win32_lua_destdir)/http/requests/
- $(U2D) $(win32_lua_destdir)/http/requests/*.xml
- cp $(srcdir)/share/lua/http/requests/readme $(win32_lua_destdir)/http/requests/readme.txt
- $(U2D) $(win32_lua_destdir)/http/requests/readme.txt
-
-#Lua Scripts
- $(INSTALL) -d $(win32_lua_destdir)
- for i in $(srcdir)/share/lua/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
- done
- $(INSTALL) -d $(win32_lua_destdir)/modules
- for i in $(srcdir)/share/lua/modules/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \
- done
- $(INSTALL) -d $(win32_lua_destdir)/extensions
- for i in $(srcdir)/share/lua/extensions/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \
- done
- $(INSTALL) -d $(win32_lua_destdir)/intf
- for i in $(srcdir)/share/lua/intf/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/`basename $${i}` ; \
- done
- $(INSTALL) -d $(win32_lua_destdir)/intf/modules
- for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \
- done
- $(INSTALL) -d $(win32_lua_destdir)/meta/art
- for i in $(srcdir)/share/lua/meta/art/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
- done
- $(INSTALL) -d $(win32_lua_destdir)/meta/fetcher
- for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \
- done
- $(INSTALL) -d $(win32_lua_destdir)/meta/reader
- for i in $(srcdir)/share/lua/meta/reader/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
- done
- $(INSTALL) -d $(win32_lua_destdir)/playlist
- for i in $(srcdir)/share/lua/playlist/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
- done
- $(INSTALL) -d $(win32_lua_destdir)/sd
- for i in $(srcdir)/share/lua/sd/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \
- done
-
- $(U2D) $(win32_lua_destdir)/README.txt
- $(U2D) $(win32_lua_destdir)/extensions/README.txt
- $(U2D) $(win32_lua_destdir)/intf/README.txt
- $(U2D) $(win32_lua_destdir)/meta/art/README.txt
- $(U2D) $(win32_lua_destdir)/meta/fetcher/README.txt
- $(U2D) $(win32_lua_destdir)/meta/reader/README.txt
- $(U2D) $(win32_lua_destdir)/playlist/README.txt
- $(U2D) $(win32_lua_destdir)/sd/README.txt
+ mkdir -p $(win32_destdir)/lua
+ cp -r $(destdir)/lib/vlc/lua/* $(win32_destdir)/lua
+ cp -r $(destdir)/share/vlc/lua/* $(win32_destdir)/lua
endif
-# Copy the http files
if BUILD_HTTPD
- cp -r $(destdir)/share/vlc/http $(win32_http_destdir)
- $(U2D) $(win32_http_destdir)/*.html
- $(U2D) $(win32_http_destdir)/.hosts
- $(U2D) $(win32_http_destdir)/*.css
- $(U2D) $(win32_http_destdir)/js/*.js
- $(U2D) $(win32_http_destdir)/dialogs/*
- $(U2D) $(win32_http_destdir)/dialogs/.hosts
- $(U2D) $(win32_http_destdir)/requests/*.xml
- mv $(win32_http_destdir)/requests/readme $(win32_http_destdir)/requests/readme.txt
- $(U2D) $(win32_http_destdir)/requests/readme.txt
+ cp -r $(destdir)/share/vlc/http $(win32_destdir)
endif
-
if BUILD_SKINS
cp -r $(destdir)/share/vlc/skins2 $(win32_destdir)/skins
endif
-
if BUILD_OSDMENU
-#OSD Menu
- mkdir -p "$(win32_destdir)/osdmenu"
- cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu"
- for dir in default default/selected default/selection default/volume ;do \
- mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \
- for file in $(srcdir)/share/osdmenu/$${dir}/*.png;do \
- cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \
- done; \
- done
- $(U2D) $(win32_destdir)/osdmenu/*.cfg;
+ cp -r $(destdir)/share/vlc/osdmenu "$(win32_destdir)/osdmenu"
for file in $(win32_destdir)/osdmenu/*.cfg; do \
sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \
sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \
rm -f -- "$$file.tmp"; \
done
endif
+if !HAVE_WIN64
+if !HAVE_WINCE
+ cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/"
+ cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
+ cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/"
+ cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
+endif
+endif
# SDK
- mkdir -p "$(win32_destdir)/sdk"
- mkdir -p "$(win32_destdir)/sdk/lib"
+ mkdir -p "$(win32_destdir)/sdk/lib"
cp -r $(destdir)/include "$(win32_destdir)/sdk"
cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \
- cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
-
-# Strip DLLs
-package-win-common-strip: package-win32-base-debug
- for i in "" $(win32_destdir)/*$(LIBEXT) \
- $(win32_destdir)/*$(EXEEXT) \
- $(win32_destdir)/activex/*$(LIBEXT) \
- $(win32_destdir)/mozilla/*$(LIBEXT) \
- $(win32_destdir)/plugins/*$(LIBEXT) \
- ; do \
- if test -n "$$i" ; then \
+ cp -rv $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
+if !HAVE_WIN64
+if !HAVE_WINCE
+ mkdir -p "$(win32_destdir)/sdk/activex"
+ cp $(top_builddir)/activex-vlc/README $(win32_destdir)/sdk/activex/README.TXT
+ cp $(top_builddir)/activex-vlc/src/test.html $(win32_destdir)/sdk/activex/
+endif
+endif
+
+ find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \;
+
+#Enable DEP and ASLR for all the binaries
+if USE_PEFLAGS
+ find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print \) -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \;
+endif
+ find $(win32_destdir)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \;
+
+package-win-base: package-win-common
+ find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \
+ do if test -n "$$i" ; then \
$(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
$(OBJCOPY) --strip-all "$$i" ; \
$(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
fi ; \
done
-package-win32-base: package-win-common-strip
+package-win32-webplugin-common: package-win-base
+ mkdir -p "$(win32_xpi_destdir)/plugins"
+ find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;
+if !HAVE_WIN64
+ cp $(top_builddir)/npapi-vlc/src/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
+endif
+ cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins"
+ cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins"
+ rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"
+ rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"
+
+package-win32-xpi: package-win32-webplugin-common
+if !HAVE_WIN64
+ cp $(top_builddir)/npapi-vlc/src/install.rdf "$(win32_xpi_destdir)"
+ cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins
+endif
+
+package-win32-crx: package-win32-webplugin-common
+if !HAVE_WIN64
+ cp $(top_builddir)/npapi-vlc/src/manifest.json "$(win32_xpi_destdir)"
+ crxmake --pack-extension "$(win32_xpi_destdir)" \
+ --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf
+endif
+
+package-win32-base-exe: package-win-base
+# Script installer
+ cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
+ cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/"
+ mkdir "$(win32_destdir)/languages"
+ cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/"
+# Copy the UAC NSIS plugin
+ mkdir -p "$(win32_destdir)/NSIS"
+ cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS"
+ cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS"
-package-win32-base-exe: package-win32-base
# Create package
- rm -Rf $(win32_destdir)/sdk
if makensis -VERSION >/dev/null 2>&1; then \
MAKENSIS="makensis"; \
elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \
eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi"
-package-win32-base-zip: package-win32-base
-# Create package
+package-win32-base-zip: package-win-base
+# Create package
rm -f -- vlc-$(VERSION)-win32.zip
zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION)
-package-win32-base-debug-zip: package-win32-base-debug
+package-win32-base-debug-zip: package-win-common
# Create package
rm -f -- vlc-$(VERSION)-win32-debug.zip
zip -r -9 vlc-$(VERSION)-win32-debug.zip vlc-$(VERSION)
-package-win32-base-7zip: package-win32-base
-# Create package
+package-win32-base-7zip: package-win-base
+# Create package
7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32.7z vlc-$(VERSION)
-package-win32-base-debug-7zip: package-win32-base-debug
+package-win32-base-debug-7zip: package-win-common
# Create package
7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION)
package-win32-cleanup:
- rm -Rf $(win32_destdir)
- rm -Rf $(win32_debugdir)
+ rm -Rf $(win32_destdir) $(win32_debugdir)
-package-win32-exe: package-win32-base package-win32-base-exe package-win32-cleanup
+package-win32-exe: package-win-base package-win32-base-exe package-win32-cleanup
package-win32-zip: package-win32-base-zip package-win32-cleanup
package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup
-package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe
+package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe package-win32-xpi
package-win32: package-win32-no-clean package-win32-cleanup
package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup
+
#######
# WinCE
#######
-package-wince-base: package-win-common-strip
+package-wince-base: package-win-base
package-wince-base-zip: package-wince-base
-# Create package
+# Create package
rm -f -- vlc-$(VERSION)-wince.zip
zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION)
package-wince: package-wince-base-zip package-win32-cleanup
-#####################################################################
-## BeOS ##
-#####################################################################
-package-beos:
-# Check that tmp isn't in the way
- @if test -e $(srcdir)/tmp; then \
- echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
- false ; \
- else \
- echo "OK." ; mkdir $(srcdir)/tmp ; \
- fi
-
-# Copy relevant files
- mkdir -p $(srcdir)/tmp/vlc
- cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \
- THANKS NEWS tmp/vlc/
-
-# Create debug package
- xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc
- find $(srcdir)/tmp/vlc -exec mimeset -f {} \;
- mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION)
- (cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS-debug.zip vlc-$(VERSION) )
- mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS-debug.zip $(srcdir)/
- mv $(srcdir)/tmp/vlc-$(VERSION) $(srcdir)/tmp/vlc
-
-# Create normal package
- $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc
- find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \
- --strip-debug --strip-unneeded "{}" \;
- xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc
- find $(srcdir)/tmp/vlc -exec mimeset -f {} \;
- mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION)
- (cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS.zip vlc-$(VERSION) )
- mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS.zip $(srcdir)/
-
-# Clean up
- rm -Rf $(srcdir)/tmp
-
#########################################################################
## MacOS X ##
#########################################################################
zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION)
rm -Rf $(top_builddir)/vlc-$(VERSION)
-package-macosx-plugin:
-if BUILD_MOZILLA
-# Create Installer
- rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true
- mkdir -p "$(top_builddir)/macosx-plugin-instdata"
- rm -f "$(top_builddir)/projects/mozilla/VLC Plugin.plugin/Contents/MacOS/modules/libmacosx_plugin.dylib"
- cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
- rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
- export PACKAGEMAKER=
- if test -x /Developer/Tools/packagemaker; then \
- export PACKAGEMAKER=/Developer/Tools/packagemaker; \
- fi; \
- if test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then \
- export PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; \
- fi; \
- $${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
- -f "$(top_builddir)/macosx-plugin-instdata" \
- -i "$(top_builddir)/extras/package/macosx/plugin/InstallerInfo.plist" \
- -d "$(top_srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true
- rm -rf "$(top_builddir)/macosx-plugin-instdata/"
-
-# Create disk image
- rm -f "$(top_builddir)/vlc-plugin-$(VERSION).dmg"; true
- rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)/"; true
- mkdir -p "$(top_builddir)/vlc-plugin-$(VERSION)/"
- mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-$(VERSION)/"
- hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \
- "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDBZ \
- -scrub -imagekey zlib-level=9
- echo "Disk image creation completed:"
- rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)"
-endif
-
-package-macosx-xpi:
-if BUILD_MOZILLA
- mkdir -p "$(top_builddir)/macosx-xpi/plugins"
- cp $(top_builddir)/projects/mozilla/install.rdf \
- "$(top_builddir)/macosx-xpi/"
- cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" \
- "$(top_builddir)/macosx-xpi/plugins"
- cd "$(top_builddir)/macosx-xpi" && zip -r vlc-$(VERSION).xpi install.rdf plugins
-endif
-
package-translations:
@if test -e "$(srcdir)/vlc-translations-$(VERSION)"; then \
echo "Error: please remove $(srcdir)/vlc-translations-$(VERSION), it is in the way"; \