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

List:       kde-commits
Subject:    extragear/multimedia/kmid
From:       Pedro Lopez-Cabanillas <pedro.lopez.cabanillas () gmail ! com>
Date:       2010-07-24 9:16:08
Message-ID: 20100724091608.1C524AC7E2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1153948 by pedrol:

fixes: windows build, static drumstick support

 M  +2 -0      CMakeLists.txt  
 M  +6 -0      drumstick/include/macros.h  
 M  +1 -1      src/kmid_part.h  
 M  +1 -1      src/kmid_partview.h  


--- trunk/extragear/multimedia/kmid/CMakeLists.txt #1153947:1153948
@@ -36,6 +36,7 @@
         )
       else (DRUMSTICK-ALSA_FOUND AND DRUMSTICK-FILE_FOUND)
         # build the local copy
+        add_definitions (-DDRUMSTICK_STATIC)
         set (DRUMSTICK_LIBRARIES drumstick-file drumstick-alsa ${ALSA_LIBRARIES})
         set (DRUMSTICK_INCLUDEDIR "${CMAKE_CURRENT_SOURCE_DIR}/drumstick/include")
         add_subdirectory (drumstick)
@@ -65,6 +66,7 @@
     pkg_check_modules(DRUMSTICK drumstick-file>=0.3)
   endif (PKG_CONFIG_FOUND)
   if (NOT DRUMSTICK_FOUND)
+    add_definitions (-DDRUMSTICK_STATIC)
     set (DRUMSTICK_LIBRARIES drumstick-file)
     set (DRUMSTICK_INCLUDEDIR "${CMAKE_CURRENT_SOURCE_DIR}/drumstick/include")
     add_subdirectory (drumstick)
--- trunk/extragear/multimedia/kmid/drumstick/include/macros.h #1153947:1153948
@@ -29,6 +29,10 @@
  * @{
  */
 
+#if !defined(DRUMSTICK_EXPORT) 
+#  if defined(DRUMSTICK_STATIC)
+#    define DRUMSTICK_EXPORT
+#  else
 #if defined(drumstick_alsa_EXPORTS) || defined(drumstick_file_EXPORTS)
 #define DRUMSTICK_EXPORT Q_DECL_EXPORT
 #else
@@ -38,6 +42,8 @@
 #define DRUMSTICK_EXPORT Q_DECL_EXPORT
 #endif
 #endif
+#  endif
+#endif
 
 /** @} */
 
--- trunk/extragear/multimedia/kmid/src/kmid_part.h #1153947:1153948
@@ -23,7 +23,7 @@
 #include <KMediaPlayer/Player>
 
 #ifndef KMIDPART_EXPORT
-# if defined(kmid_part_EXPORTS)
+# if defined(kmid_part_EXPORTS) || defined(MAKE_KMID_PART_LIB)
 #  define KMIDPART_EXPORT KDE_EXPORT
 # else
 #  define KMIDPART_EXPORT KDE_IMPORT
--- trunk/extragear/multimedia/kmid/src/kmid_partview.h #1153947:1153948
@@ -23,7 +23,7 @@
 #include <KMediaPlayer/View>
 
 #ifndef KMIDPART_EXPORT
-# if defined(kmid_part_EXPORTS)
+# if defined(kmid_part_EXPORTS) || defined(MAKE_KMID_PART_LIB)
 #  define KMIDPART_EXPORT KDE_EXPORT
 # else
 #  define KMIDPART_EXPORT KDE_IMPORT
[prev in list] [next in list] [prev in thread] [next in thread]