mkv.cpp: don't use the default edition if there is none

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b38b58c1f3ef3144368274ec69713e45ca1ad73a..739a95f77b3f33d39fcfee99d375f50d5dbffd43 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -417,7 +417,12 @@ bin_PROGRAMS = vlc
 
 vlc_SOURCES = src/vlc.c
 
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin`
+# Work around a bug in the arm-wince-pe linker
+if HAVE_WINCE
+vlc_WORKAROUNDLDFLAGS = lib/libvlc.a
+endif
+
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS)
 vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 
@@ -779,6 +784,10 @@ if BUILD_ACTIVEX
        cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
        $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 endif
+# Rebase all those DLLs to speed up loading (need cygwin rebase)
+       if [ -x rebase ]; then \
+               find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
+       fi
 
 package-win32-base-exe:
 # Create package