Merge pull request #1957 from curlymorphic/1822

rebase of pr 1822 build fixes for freebsd
2015-04-15 04:52:54 +00:00
parent d516c74b73 e4a4dfd036
commit c270c7b701
4 changed files with 10 additions and 2 deletions
--- a/include/AudioPortAudio.h
+++ b/include/AudioPortAudio.h
@@ -45,7 +45,11 @@ public:

 #ifdef LMMS_HAVE_PORTAUDIO

+#if defined(__FreeBSD__)
+#include <portaudio2/portaudio.h>
+#else
 #include <portaudio.h>
+#endif

 #include "AudioDevice.h"

--- a/include/lmms_math.h
+++ b/include/lmms_math.h
@@ -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
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,3 +1,7 @@
+INCLUDE_DIRECTORIES(
+	${SAMPLERATE_INCLUDE_DIRS}
+)
+
 ADD_SUBDIRECTORY(Amplifier)
 ADD_SUBDIRECTORY(audio_file_processor)
 ADD_SUBDIRECTORY(BassBooster)
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -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)