* dialogs.cpp: fixed an assert failure in open skins dialog

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 97ccb95071d00239890f42cf2fcb417320ef018c..d8e4d6415710fb567e23257486e3d4c5f3acb7af 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -384,6 +384,7 @@ SOURCES_libvlc_common = \
        src/misc/block.c \
        src/misc/modules.c \
        src/misc/threads.c \
+       src/misc/unicode.c \
        src/misc/cpu.c \
        src/misc/configuration.c \
        src/misc/image.c \
@@ -436,9 +437,9 @@ DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
        @rm -f $(top_builddir)/vlc$(EXEEXT)
        @case `$(VLC_CONFIG) --linkage vlc builtin` in \
-         c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
-         objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
-         c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+         c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
+         objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
+         c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
        esac
 
 if HAVE_BEOS
@@ -560,6 +561,8 @@ VLC-release.app: vlc
            voutgl.m \
            wizard.h \
            wizard.m \
+           extended.h \
+           extended.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -670,6 +673,8 @@ VLC.app: vlc
            voutgl.m \
            wizard.h \
            wizard.m \
+           extended.h \
+           extended.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \