skins2: implement art display in image controls

[vlc] / modules / gui / skins2 / Modules.am

diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am
index c64f53c97b67c8cdef83f9722feca7511ebdc016..259bc78edc52856c2e9586fa655b14ac04673bc9 100644 (file)
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Modules.am
@@ -38,8 +38,6 @@ SOURCES_skins2 = \
        commands/cmd_snapshot.cpp \
        commands/cmd_snapshot.hpp \
        commands/cmd_show_window.hpp \
-       commands/cmd_update_item.cpp \
-       commands/cmd_update_item.hpp \
        commands/cmd_vars.cpp \
        commands/cmd_vars.hpp \
        \
@@ -109,10 +107,14 @@ SOURCES_skins2 = \
        src/dialogs.hpp \
        src/file_bitmap.cpp \
        src/file_bitmap.hpp \
+       src/art_bitmap.cpp \
+       src/art_bitmap.hpp \
        src/ft2_bitmap.cpp \
        src/ft2_bitmap.hpp \
        src/ft2_font.cpp \
        src/ft2_font.hpp \
+       src/ft2_err.c \
+       src/ft2_err.h \
        src/generic_bitmap.cpp \
        src/generic_bitmap.hpp \
        src/generic_font.hpp \
@@ -178,6 +180,8 @@ SOURCES_skins2 = \
        utils/var_percent.hpp \
        utils/var_text.cpp \
        utils/var_text.hpp \
+       utils/var_string.cpp \
+       utils/var_string.hpp \
        utils/var_tree.cpp \
        utils/var_tree.hpp \
        \
@@ -209,7 +213,8 @@ SOURCES_skins2 += \
        win32/win32_window.cpp \
        win32/win32_window.hpp \
     $(NULL)
-else if HAVE_DARWIN
+else
+if HAVE_DARWIN
 SOURCES_skins2 += \
        macosx/macosx_dragdrop.cpp \
        macosx/macosx_dragdrop.hpp \
@@ -250,4 +255,4 @@ SOURCES_skins2 += \
        x11/x11_tooltip.hpp \
     $(NULL)
 endif
-
+endif