From 1ec5d937f619e3a9caa77b2210042607f00ab83c Mon Sep 17 00:00:00 2001
From: Jon Bergli Heier <snakebite@jvnv.net>
Date: Thu, 6 Jan 2011 13:20:58 +0100
Subject: Fixed libs and includes to compile under Linux.

---
 SConstruct                | 2 ++
 decoders/ffmpeg_decoder.h | 3 +++
 decoders/mpg123_decoder.h | 2 ++
 encoders/lame_encoder.h   | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/SConstruct b/SConstruct
index ed654ef..3e123a2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -13,6 +13,8 @@ else:
 	if conf.CheckCXXHeader('soci/soci.h'):
 		env.Append(LIBS = ['soci_core'])
 	env = conf.Finish()
+	env.ParseConfig('pkg-config --cflags --libs libavcodec')
+	env.ParseConfig('pkg-config --cflags --libs libavformat')
 
 if GetOption('release'):
 	env.Append(CCFLAGS = ['-O2'])
diff --git a/decoders/ffmpeg_decoder.h b/decoders/ffmpeg_decoder.h
index a77e303..c6e0db1 100644
--- a/decoders/ffmpeg_decoder.h
+++ b/decoders/ffmpeg_decoder.h
@@ -3,6 +3,9 @@
 
 #include "decoder.h"
 
+// needed for UINT64_C in libavutil
+#include <boost/cstdint.hpp>
+
 extern "C" {
 	#include <libavformat/avformat.h>
 	#include <libavcodec/avcodec.h>
diff --git a/decoders/mpg123_decoder.h b/decoders/mpg123_decoder.h
index f71dbe7..bc35ed9 100644
--- a/decoders/mpg123_decoder.h
+++ b/decoders/mpg123_decoder.h
@@ -5,6 +5,8 @@
 
 #include <fstream>
 #include <mpg123.h>
+// needed for uint8_t
+#include <boost/cstdint.hpp>
 
 class DecoderMpg123 : public Decoder {
 	private:
diff --git a/encoders/lame_encoder.h b/encoders/lame_encoder.h
index 3d1137d..d150f60 100644
--- a/encoders/lame_encoder.h
+++ b/encoders/lame_encoder.h
@@ -4,6 +4,8 @@
 #include "encoder.h"
 
 #include <lame/lame.h>
+// needed for uint8_t
+#include <boost/cstdint.hpp>
 
 class EncoderLame : public Encoder {
 	private:
-- 
cgit v1.2.3