rebase of pr 1822 build fixes for freebsd

simply copied and pasted the changes from pr#1822
This commit is contained in:
Dave French
2015-04-14 20:00:55 +01:00
parent d516c74b73
commit e4a4dfd036
4 changed files with 10 additions and 2 deletions

View File

@@ -45,7 +45,11 @@ public:
#ifdef LMMS_HAVE_PORTAUDIO
#if defined(__FreeBSD__)
#include <portaudio2/portaudio.h>
#else
#include <portaudio.h>
#endif
#include "AudioDevice.h"

View File

@@ -34,7 +34,7 @@
#include <cmath>
using namespace std;
#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU)
#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__)
#ifndef isnanf
#define isnanf(x) isnan(x)
#endif

View File

@@ -1,3 +1,7 @@
INCLUDE_DIRECTORIES(
${SAMPLERATE_INCLUDE_DIRS}
)
ADD_SUBDIRECTORY(Amplifier)
ADD_SUBDIRECTORY(audio_file_processor)
ADD_SUBDIRECTORY(BassBooster)

View File

@@ -147,7 +147,7 @@ ENDIF(LMMS_BUILD_WIN32)
# FLTK needs X
IF(LMMS_BUILD_LINUX)
TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -ldl)
TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${CMAKE_DL_LIBS})
ENDIF(LMMS_BUILD_LINUX)