diff options
| author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-01-06 13:20:58 +0100 |
|---|---|---|
| committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-01-06 13:20:58 +0100 |
| commit | 1ec5d937f619e3a9caa77b2210042607f00ab83c (patch) | |
| tree | d612e56e6f100707d16d9d7273af48d2a81f823e | |
| parent | 822ae13835c2f6443d5b4fface6f3f547bcfcb11 (diff) | |
Fixed libs and includes to compile under Linux.
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | decoders/ffmpeg_decoder.h | 3 | ||||
| -rw-r--r-- | decoders/mpg123_decoder.h | 2 | ||||
| -rw-r--r-- | encoders/lame_encoder.h | 2 |
4 files changed, 9 insertions, 0 deletions
@@ -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: |