mirror of https://code.videolan.org/videolan/vlc
Win32: makefile cleanup
This commit is contained in:
parent
8bc369ef19
commit
9a7ac26b00
10
Makefile.am
10
Makefile.am
|
@ -706,10 +706,10 @@ package-win-common:
|
|||
fi
|
||||
|
||||
# Copy relevant files
|
||||
# Copy executables and libs
|
||||
# Copy executables, major libs+manifests
|
||||
cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
|
||||
cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
|
||||
cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
|
||||
cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
|
||||
cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
|
||||
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
|
||||
|
||||
|
@ -792,9 +792,6 @@ package-win32-base-debug: package-win-common
|
|||
$(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
|
||||
fi ; done
|
||||
|
||||
# Contrib *.dll's
|
||||
# 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 \
|
||||
|
@ -1009,6 +1006,9 @@ package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
|
|||
# Clean up
|
||||
rm -Rf $(win32_destdir)
|
||||
|
||||
#######
|
||||
# WinCE
|
||||
#######
|
||||
package-wince-base: package-win-common-strip
|
||||
|
||||
package-wince-base-zip: package-wince-base
|
||||
|
|
Loading…
Reference in New Issue