[Performous-commit] Lasse Karkkainen : Try fixing linking issues on Mac (and Windows)

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: fce6aab809de2b3ba647667523c0bd8eda70d577

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Dec  2 21:16:31 2009 +0200

Try fixing linking issues on Mac (and Windows)

Conflicts:

	libs/libda/plugins/CMakeLists.txt

---

 libs/libda/plugins/CMakeLists.txt |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/libs/libda/plugins/CMakeLists.txt b/libs/libda/plugins/CMakeLists.txt
index 4606599..5ba820d 100644
--- a/libs/libda/plugins/CMakeLists.txt
+++ b/libs/libda/plugins/CMakeLists.txt
@@ -126,18 +126,18 @@ if(PLUGIN_GSTREAMER)
 	add_library(da_audio_dev_gst MODULE audio_dev_gst.cpp)
 	target_link_libraries(da_audio_dev_gst ${GStreamer_LIBRARIES})
 	install(TARGETS da_audio_dev_gst DESTINATION ${LibDA_PLUGIN_DIR})
-	if(APPLE)
-		target_link_libraries(da_audio_dev_gst da)
-	endif(APPLE)
+	if(APPLE OR WIN32)
+		target_link_libraries(da_audio_dev_gst da plugin++ ${Boost_LIBRARIES})
+	endif(APPLE OR WIN32)
 endif(PLUGIN_GSTREAMER)
 
 if(PLUGIN_JACK)
 	include_directories(${Jack_INCLUDE_DIRS})
 	add_library(da_audio_dev_jack MODULE audio_dev_jack.cpp)
 	target_link_libraries(da_audio_dev_jack ${Jack_LIBRARIES})
-	if(APPLE)
-		target_link_libraries(da_audio_dev_jack da)
-	endif(APPLE)
+	if(APPLE OR WIN32)
+		target_link_libraries(da_audio_dev_jack da plugin++ ${Boost_LIBRARIES})
+	endif(APPLE OR WIN32)
 	install(TARGETS da_audio_dev_jack DESTINATION ${LibDA_PLUGIN_DIR})
 endif(PLUGIN_JACK)
 
@@ -147,10 +147,7 @@ if(PLUGIN_PORTAUDIO)
 	target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} ${Portaudio_LIBRARIES})
 	install(TARGETS da_audio_dev_pa${Portaudio_VERSION} DESTINATION ${LibDA_PLUGIN_DIR})
 	if(APPLE OR WIN32)
-		target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} da)
-		if(WIN32)
-			target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} plugin++)
-		endif(WIN32)
+		target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} da plugin++ ${Boost_LIBRARIES})
 	endif(APPLE OR WIN32)
 endif(PLUGIN_PORTAUDIO)
 
@@ -165,7 +162,7 @@ if(PLUGIN_TESTING)
 	add_library(da_audio_dev_tone MODULE audio_dev_tone.cpp)
 	install(TARGETS da_audio_dev_tone DESTINATION ${LibDA_PLUGIN_DIR})
 	if(APPLE OR WIN32)
-		target_link_libraries(da_audio_dev_tone da plugin++)
+		target_link_libraries(da_audio_dev_tone da plugin++ ${Boost_LIBRARIES})
 	endif(APPLE OR WIN32)
 endif(PLUGIN_TESTING)