diff options
author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
---|---|---|
committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
commit | e55b0d8a97d0be6be188d5d13f675da935c039ef (patch) | |
tree | ce9d7834fc75cd1c072bceff614ef3b1eb39052c /src/libaudcore/Makefile | |
parent | df5213d83c2bf1abd97568cef5a1a763bc425926 (diff) | |
parent | 66d524c01720835a30716cb6861606f95629faea (diff) |
fix conflict
Diffstat (limited to 'src/libaudcore/Makefile')
-rw-r--r-- | src/libaudcore/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libaudcore/Makefile b/src/libaudcore/Makefile index 7070823..68768ed 100644 --- a/src/libaudcore/Makefile +++ b/src/libaudcore/Makefile @@ -1,5 +1,5 @@ SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX} -LIB_MAJOR = 3 +LIB_MAJOR = 4 LIB_MINOR = 1 SRCS = adder.cc \ @@ -9,6 +9,7 @@ SRCS = adder.cc \ audstrings.cc \ charset.cc \ config.cc \ + cue-cache.cc \ drct.cc \ effect.cc \ equalizer.cc \ @@ -27,6 +28,7 @@ SRCS = adder.cc \ output.cc \ playback.cc \ playlist.cc \ + playlist-cache.cc \ playlist-files.cc \ playlist-utils.cc \ plugin-init.cc \ @@ -55,6 +57,7 @@ INCLUDES = audio.h \ audstrings.h \ drct.h \ equalizer.h \ + export.h \ hook.h \ i18n.h \ index.h \ @@ -95,7 +98,8 @@ CPPFLAGS := -I.. -I../.. \ -DHARDCODE_PLUGINDIR=\"${plugindir}\" \ -DHARDCODE_LOCALEDIR=\"${localedir}\" \ -DHARDCODE_DESKTOPFILE=\"${datarootdir}/applications/audacious.desktop\" \ - -DHARDCODE_ICONFILE=\"${datarootdir}/icons/hicolor/48x48/apps/audacious.png\" + -DHARDCODE_ICONFILE=\"${datarootdir}/icons/hicolor/48x48/apps/audacious.png\" \ + -DLIBAUDCORE_BUILD CFLAGS += ${LIB_CFLAGS} |