summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-17 05:21:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-17 05:21:34 +0000
commitacd32952e36ead25eed2c7343701d6c9125d9393 (patch)
tree8a5b077b0dfd8ad4ef7259fa874cc9144c4b8712
parent69c1fdb63e9be2d99084edfe5b5d5c389a8ab91a (diff)
downloadrosegarden-acd32952e36ead25eed2c7343701d6c9125d9393.tar.gz
rosegarden-acd32952e36ead25eed2c7343701d6c9125d9393.zip
Fix rosegarden FTBFS under oneiricv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1259267 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/CMakeLists.txt13
-rw-r--r--src/sound/AudioCache.h1
2 files changed, 14 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d942e71..7c1d432 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,6 +49,10 @@ ADD_LIBRARY(RosegardenCommon STATIC
${common_sound_SRCS}
)
+TARGET_LINK_LIBRARIES(RosegardenCommon
+ dl
+)
+
IF(USE_PCH)
ADD_DEPENDENCIES(RosegardenCommon precompiled_headers)
ENDIF(USE_PCH)
@@ -76,6 +80,7 @@ IF(USE_PCH)
ENDIF(USE_PCH)
TARGET_LINK_LIBRARIES(rosegardensequencer
+ dl
${QT_AND_KDECORE_LIBS}
${ALSA_LIBS}
${JACK_LIBS}
@@ -102,6 +107,11 @@ ADD_LIBRARY(RosegardenExtended STATIC
${gui_SRCS}
)
+TARGET_LINK_LIBRARIES(RosegardenExtended
+ dl
+ lo
+)
+
ADD_LIBRARY(RosegardenCommands STATIC
${commands_SRCS}
)
@@ -137,6 +147,8 @@ IF(USE_PCH)
ENDIF(USE_PCH)
TARGET_LINK_LIBRARIES(rosegarden
+ dl
+ lo
${QT_AND_KDECORE_LIBS}
${LIBLO_LIBS}
${LRDF_LIBS}
@@ -185,6 +197,7 @@ IF(WANT_TEST)
)
TARGET_LINK_LIBRARIES(RosegardenTestDriver
+ dl
${QT_AND_KDECORE_LIBS}
${LIBLO_LIBS}
${LRDF_LIBS}
diff --git a/src/sound/AudioCache.h b/src/sound/AudioCache.h
index 6dd55ff..de7c6e0 100644
--- a/src/sound/AudioCache.h
+++ b/src/sound/AudioCache.h
@@ -22,6 +22,7 @@
#ifndef _AUDIO_CACHE_H_
#define _AUDIO_CACHE_H_
+#include <cstddef>
#include <map>
namespace Rosegarden