Skip to content
Snippets Groups Projects
Commit 12fd1376 authored by Yun Liu's avatar Yun Liu
Browse files

Patch for gcc4.3 and libtool2.2.4

parent f9591768
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define LIFETIME_LIBRARY_HPP #define LIFETIME_LIBRARY_HPP
#include <cassert> #include <cassert>
#include <algorithm>
#include "PrivateMembers.hpp" #include "PrivateMembers.hpp"
#include "CreationUsingNew.hpp" #include "CreationUsingNew.hpp"
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#define LIFETIME_WITH_LONGEVITY_HPP #define LIFETIME_WITH_LONGEVITY_HPP
#include <cassert> #include <cassert>
#include "PrivateMembers.hpp" #include "PrivateMembers.hpp"
#include <algorithm>
namespace utilspp namespace utilspp
{ {
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <fstream> #include <fstream>
#include <math.h> #include <math.h>
#include <samplerate.h> #include <samplerate.h>
#include <cstring>
AudioFile::AudioFile() AudioFile::AudioFile()
: AudioLoop(), : AudioLoop(),
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
*/ */
#include "audioloop.h" #include "audioloop.h"
#include <math.h> #include <math.h>
#include <strings.h>
AudioLoop::AudioLoop():_buffer(0), _size(0), _pos(0), _sampleRate(0) AudioLoop::AudioLoop():_buffer(0), _size(0), _pos(0), _sampleRate(0)
{ {
......
...@@ -5,7 +5,7 @@ GSM_LIB = libcodec_gsm.so ...@@ -5,7 +5,7 @@ GSM_LIB = libcodec_gsm.so
libcodec_gsm_so_SOURCES = gsmcodec.cpp libcodec_gsm_so_SOURCES = gsmcodec.cpp
libcodec_gsm_so_CFLAGS = -fPIC -g -Wall libcodec_gsm_so_CFLAGS = -fPIC -g -Wall
libcodec_gsm_so_CXXFLAGS = -fPIC -g -Wall libcodec_gsm_so_CXXFLAGS = -fPIC -g -Wall
libcodec_gsm_so_LDFLAGS = -shared -lc -lgsm libcodec_gsm_so_LDFLAGS = --shared -lc -lgsm
INSTALL_GSM_RULE = install-libcodec_gsm_so INSTALL_GSM_RULE = install-libcodec_gsm_so
endif endif
...@@ -14,7 +14,7 @@ SPEEX_LIB = libcodec_speex.so ...@@ -14,7 +14,7 @@ SPEEX_LIB = libcodec_speex.so
libcodec_speex_so_SOURCES = speexcodec.cpp libcodec_speex_so_SOURCES = speexcodec.cpp
libcodec_speex_so_CFLAGS = -fPIC -g -Wall libcodec_speex_so_CFLAGS = -fPIC -g -Wall
libcodec_speex_so_CXXFLAGS = -fPIC -g -Wall libcodec_speex_so_CXXFLAGS = -fPIC -g -Wall
libcodec_speex_so_LDFLAGS = -shared -lc -lspeex libcodec_speex_so_LDFLAGS = --shared -lc -lspeex
INSTALL_SPEEX_RULE = install-libcodec_speex_so INSTALL_SPEEX_RULE = install-libcodec_speex_so
endif endif
...@@ -23,7 +23,7 @@ ILBC_LIB = libcodec_ilbc.so ...@@ -23,7 +23,7 @@ ILBC_LIB = libcodec_ilbc.so
libcodec_ilbc_so_SOURCES = ilbc.cpp libcodec_ilbc_so_SOURCES = ilbc.cpp
libcodec_ilbc_so_CFLAGS = -fPIC -g -Wall libcodec_ilbc_so_CFLAGS = -fPIC -g -Wall
libcodec_ilbc_so_CXXFLAGS = -fPIC -g -Wall libcodec_ilbc_so_CXXFLAGS = -fPIC -g -Wall
libcodec_ilbc_so_LDFLAGS = -shared ilbc/*.o -lc libcodec_ilbc_so_LDFLAGS = --shared ilbc/*.o -lc
INSTALL_ILBC_RULE = install-libcodec_ilbc_so INSTALL_ILBC_RULE = install-libcodec_ilbc_so
SUBDIRS = ilbc SUBDIRS = ilbc
endif endif
...@@ -35,12 +35,12 @@ noinst_HEADERS = audiocodec.h ...@@ -35,12 +35,12 @@ noinst_HEADERS = audiocodec.h
libcodec_ulaw_so_SOURCES = ulaw.cpp libcodec_ulaw_so_SOURCES = ulaw.cpp
libcodec_ulaw_so_CFLAGS = -fPIC -g -Wall libcodec_ulaw_so_CFLAGS = -fPIC -g -Wall
libcodec_ulaw_so_CXXFLAGS = -fPIC -g -Wall libcodec_ulaw_so_CXXFLAGS = -fPIC -g -Wall
libcodec_ulaw_so_LDFLAGS = -shared -lc libcodec_ulaw_so_LDFLAGS = --shared -lc
libcodec_alaw_so_SOURCES = alaw.cpp libcodec_alaw_so_SOURCES = alaw.cpp
libcodec_alaw_so_CFLAGS = -fPIC -g -Wall libcodec_alaw_so_CFLAGS = -fPIC -g -Wall
libcodec_alaw_so_CXXFLAGS = -fPIC -g -Wall libcodec_alaw_so_CXXFLAGS = -fPIC -g -Wall
libcodec_alaw_so_LDFLAGS = -shared -lc libcodec_alaw_so_LDFLAGS = --shared -lc
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
*/ */
#include "tone.h" #include "tone.h"
#include <math.h> #include <math.h>
#include <cstdlib>
#include <strings.h>
Tone::Tone(const std::string& definition, unsigned int sampleRate) : AudioLoop(), _sampleRate(sampleRate) Tone::Tone(const std::string& definition, unsigned int sampleRate) : AudioLoop(), _sampleRate(sampleRate)
{ {
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#include "../global.h" #include "../global.h"
#include <fstream> #include <fstream>
#include <cstdlib>
namespace Conf { namespace Conf {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment