Commit 74dc4346 authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen

Use akode-config to find akode and make JuK compile

svn path=/trunk/KDE/kdemultimedia/juk/; revision=434556
parent 7a4c75ee
......@@ -74,7 +74,7 @@ juk_SOURCES = \
tagguessertest_SOURCES = tagguessertest.cpp tagguesser.cpp
INCLUDES= $(all_includes) $(taglib_includes) $(GST_CFLAGS) $(ARTS_CFLAGS)
INCLUDES= $(all_includes) $(taglib_includes) $(akode_includes) $(GST_CFLAGS) $(ARTS_CFLAGS)
##################################################
# check to see if MusicBrainz is available
......@@ -84,7 +84,7 @@ mblibs = -ltunepimp
endif
##################################################
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(LIB_KHTML) $(LIB_ARTS) ../akode/lib/libakode.la
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST)
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
......
......@@ -14,12 +14,14 @@
#include <config.h>
#if HAVE_AKODE
#include <kdebug.h>
#include <qfile.h>
#include "../akode/lib/player.h"
#include "../akode/lib/decoder.h"
#include <akode/player.h>
#include <akode/decoder.h>
#include "akodeplayer.h"
......@@ -163,3 +165,5 @@ void aKodePlayer::seekPosition(int position)
}
#include "akodeplayer.moc"
#endif
......@@ -18,10 +18,13 @@
#include <config.h>
#if HAVE_AKODE
#include <qstring.h>
#include "player.h"
#include <kdemacros.h>
namespace aKode {
class File;
class Player;
......@@ -59,3 +62,4 @@ private:
};
#endif
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment