[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/kscd
From:       David Faure <faure () kde ! org>
Date:       2006-04-03 22:19:46
Message-ID: 1144102786.262663.16038.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 526128 by dfaure:

Compile all the sources (libworkman was missing)
Ported to config-alsa.h


 M  +18 -6     CMakeLists.txt  
 M  +3 -1      libwm/audio/audio.c  
 M  +4 -1      libwm/audio/audio_alsa.c  


--- trunk/KDE/kdemultimedia/kscd/CMakeLists.txt #526127:526128
@@ -2,16 +2,25 @@
 project(kscd)
 
 set(libworkmanaudio_SRCS 
-	${CMAKE_SOURCE_DIR}/kscd/libwm/audio/audio.c 
-	${CMAKE_SOURCE_DIR}/kscd/libwm/audio/audio_alsa.c 
-	${CMAKE_SOURCE_DIR}/kscd/libwm/audio/audio_arts.c 
-	${CMAKE_SOURCE_DIR}/kscd/libwm/audio/audio_sun.c
+	libwm/audio/audio.c 
+	libwm/audio/audio_alsa.c 
+	libwm/audio/audio_arts.c 
+	libwm/audio/audio_sun.c
 	)
 
+set(libworkman_SRCS 
+	libwm/cddb.c libwm/cdinfo.c libwm/cdrom.c libwm/wm_helpers.c libwm/cdtext.c
+	libwm/database.c libwm/index.c libwm/scsi.c libwm/cdda.c libwm/plat_linux_cdda.c \
libwm/plat_sun_cdda.c +	libwm/plat_aix.c libwm/plat_bsd386.c libwm/plat_freebsd.c \
libwm/plat_hpux.c libwm/plat_irix.c +	libwm/plat_linux.c libwm/plat_svr4.c \
libwm/plat_ultrix.c libwm/plat_news.c libwm/plat_openbsd.c +	libwm/plat_osf1.c \
libwm/plat_sun.c libwm/plat_scor5.c +	libwm/drv_sony.c libwm/drv_toshiba.c
+	)
+
 add_subdirectory( bitmaps ) 
 add_subdirectory( libwm ) 
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR}  ) +include_directories( ${CMAKE_SOURCE_DIR}/libkcddb \
${CMAKE_BINARY_DIR}/libkcddb ${KDE4_INCLUDES} )  
 
 ########### next target ###############
@@ -19,7 +28,7 @@
 
 ########### next target ###############
 
-set(kscd_SRCS kscd.cpp ledlamp.cpp docking.cpp bwlednum.cpp  configWidget.cpp \
cddbdlg.cpp ${libkcompactdisc_SRCS} ${libworkmanaudio_SRCS} ${libworkman_SRCS}) \
+set(kscd_SRCS kscd.cpp ledlamp.cpp docking.cpp bwlednum.cpp  configWidget.cpp \
cddbdlg.cpp kcompactdisc.cpp ${libworkmanaudio_SRCS} ${libworkman_SRCS})  
 kde4_add_ui3_files(kscd_SRCS configWidgetUI.ui panel.ui )
 
@@ -32,6 +41,9 @@
 kde4_add_executable(kscd ${kscd_SRCS})
 
 target_link_libraries(kscd  ${KDE4_KIO_LIBS} kcddb )
+if (HAVE_LIBASOUND2)
+    target_link_libraries(kscd ${ASOUND_LIBRARY})
+endif (HAVE_LIBASOUND2)
 
 install_targets(/bin kscd )
 
--- trunk/KDE/kdemultimedia/kscd/libwm/audio/audio.c #526127:526128
@@ -1,5 +1,7 @@
 #include "audio.h"
 
+#include <config.h>
+#include <config-alsa.h>
 #include <string.h>
 
 struct audio_oops* setup_arts(const char *dev, const char *ctl);
@@ -16,7 +18,7 @@
   if(!strcmp(ss, "arts"))
     return setup_arts(dev, ctl);
 #endif
-#if defined(HAVE_ARTS_LIBASOUND2)
+#if defined(HAVE_LIBASOUND2)
   if(!strcmp(ss, "alsa"))
     return setup_alsa(dev, ctl);
 #endif
--- trunk/KDE/kdemultimedia/kscd/libwm/audio/audio_alsa.c #526127:526128
@@ -17,10 +17,13 @@
 
 
 #include <config.h>
+#include <config-alsa.h>
 
-#if defined(HAVE_ARTS_LIBASOUND2)
+#if defined(HAVE_LIBASOUND2)
 
+#ifdef HAVE_ALSA_ASOUNDLIB_H
 #include <alsa/asoundlib.h>
+#endif
 #include "audio.h"
 
 char* device = NULL;


[prev in list] [next in list] [prev in thread] [next in thread]