if LOADER
SUBDIRS += libs/loader
endif
-if HAVE_LIBGCRYPT
+if HAVE_GCRYPT
SUBDIRS += libs/srtp
endif
if HAVE_ZLIB
INSTALL.wince \
extras/package/win32/vlc.exe.manifest \
extras/package/win32/libvlc.dll.manifest \
- MAINTAINERS \
extras/package/macosx/README.MacOSX.rtf \
vlc-config.in.in \
extras/package/rpm/vlc.fedora.spec \
extras/package/rpm/vlc.altlinux.spec \
extras/package/win32/vlc.win32.nsi.in \
+ extras/package/win32/spad.nsi.in \
extras/package/win32/languages/declaration.nsh \
extras/package/win32/languages/english.nsh \
extras/package/win32/languages/french.nsh
dist_noinst_SCRIPTS = bootstrap toolbox
nodist_noinst_SCRIPTS = compile
-BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi
+BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi
if HAVE_DARWIN
BUILT_SOURCES_clean = macosx-sdk
else
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
endif
-xcodebuild_FLAGS = $(xcodebuildsilentflags_$(V))
-xcodebuildsilentflags_ = $(xcodebuildsilentflags__$(AM_DEFAULT_VERBOSITY))
-xcodebuildsilentflags_0 = 2>&1 >/dev/null
+silentstd = $(silentstd_$(V))
+silentstd_ = $(silentstd__$(AM_DEFAULT_VERBOSITY))
+silentstd_0 = 2>&1 >/dev/null
# '__' prefix trick for old automake version.
-xcodebuildsilentflags__0 = $(xcodebuildsilentflags_0)
+silentstd__0 = $(silentstd_0)
# VLC-release.app for packaging and giving it to your friends
# use package-macosx to get a nice dmg
VLC-release.app: vlc
- ( cd src && $(MAKE) $(AM_MAKEFLAGS) install )
+ ( cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) )
rm -Rf "$(top_builddir)/tmp"
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC-release.app
for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done
- REVISION=`git describe --always` && \
+ REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \
cat $(top_builddir)/extras/package/macosx/Info.plist | \
sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
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 \
$(top_builddir)/tmp/modules/gui/macosx; \
done
$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
- xcodebuild -target vlc $(xcodebuild_FLAGS) && \
+ xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
cd ../../../../ && \
- cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
+ cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
# This is just for development purposes.
# The resulting VLC.app will only run in this tree.
VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
- (cd src && make install)
+ $(AM_V_GEN)(cd src && make install $(silentstd))
rm -Rf $(top_builddir)/tmp
mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC.app
for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
done
- REVISION=`git describe --always` && \
+ REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \
cat $(top_builddir)/extras/package/macosx/Info.plist | \
sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
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 \
$(top_builddir)/tmp/modules/gui/macosx; \
done
$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
- xcodebuild -target vlc $(xcodebuild_FLAGS) && \
+ xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
cd ../../../../ && \
- cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC.app
+ cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
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
# 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/"
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
+ find $(win32_destdir) -type f -name '*.dll' -print -o -name '*.exe' -print | while read i; do \
+ $(PEFLAGS) --dynamicbase=true --nxcompat=true "$$i" ; \
+ done
+endif
# Copy the lua scripts (HTTP)
if BUILD_LUA
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/
for i in $(srcdir)/share/lua/playlist/*.* ; do \
$(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
done
- $(INSTALL) -d $(win32_lua_destdir)/meta
- for i in $(srcdir)/share/lua/meta/*.* ; do \
- $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/`basename $${i}` ; \
+ $(INSTALL) -d $(win32_lua_destdir)/meta/art
+ for i in $(srcdir)/share/lua/meta/art/*.lua ; do \
+ $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
+ done
+ $(INSTALL) -d $(win32_lua_destdir)/meta/reader
+ for i in $(srcdir)/share/lua/meta/reader/*.lua ; do \
+ $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
done
$(INSTALL) -d $(win32_lua_destdir)/intf
for i in $(srcdir)/share/lua/intf/*.* ; do \
find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir
rm -Rf vlc-$(VERSION)/sdk/bin
-#strip exe and main dll
+# Strip DLLs
package-win-common-strip: package-win32-base-debug
@if test -e "$(win32_debugdir)"; then \
echo "Error: please remove $(win32_debugdir), it is in the way"; \
else \
echo "OK."; mkdir -p "$(win32_debugdir)"; \
fi
- for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
- do if test -n "$$i" ; then \
- $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
- $(OBJCOPY) --strip-all "$$i" ; \
- $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
- mv "$$i.dbg" "$(win32_debugdir)"; \
- fi; done
-
-#strip all plugins dll
+ 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 \
+ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+ $(OBJCOPY) --strip-all "$$i" ; \
+ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+ mv "$$i.dbg" "$(win32_debugdir)"; \
+ fi ; \
+ done
+
package-win32-base: package-win-common-strip
- for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \
- do if test -n "$$i" ; then \
- $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
- $(OBJCOPY) --strip-all "$$i" ; \
- $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
- mv "$$i.dbg" "$(win32_debugdir)"; \
- fi ; done
package-win32-base-exe: package-win32-base
# Create package
else \
echo 'Error: cannot locate makensis tool'; exit 1; \
fi; \
+ eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \
eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi"
package-win32-base-zip: package-win32-base
# Clean up
rm -Rf $(win32_destdir)
-package-wince-base: package-win-common package-win-common-strip
+package-wince-base: package-win-common-strip
-package-wince-base-zip:
+package-wince-base-zip: package-wince-base
# Create package
- zip -r vlc-$(VERSION)-wince.zip vlc-$(VERSION)
+ rm -f -- vlc-$(VERSION)-wince.zip
+ zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION)
-package-wince: package-wince-base package-wince-base-zip
+package-wince: package-wince-base-zip
# Clean up
rm -Rf $(win32_destdir)
projects / vlc / blobdiff