added cygwin patches (yselkowitz AT gmail.com)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1024 90c681e8-e032-0410-971d-27865f9a5e38

6 files changed, 63 insertions, 4 deletions

diff --git a/src/plugins/Output/CMakeLists.txt b/src/plugins/Output/CMakeLists.txt
index 9bd11aea8..bf04f3b47 100644
--- a/src/plugins/Output/CMakeLists.txt
+++ b/src/plugins/Output/CMakeLists.txt
@@ -2,6 +2,7 @@ SET(USE_ALSA TRUE CACHE BOOL "enable/disable alsa plugin")
 SET(USE_JACK TRUE CACHE BOOL "enable/disable jack plugin")
 SET(USE_OSS TRUE CACHE BOOL "enable/disable oss plugin")
 SET(USE_PULSE TRUE CACHE BOOL "enable/disable pulse audio plugin")
+SET(USE_WAVEOUT TRUE CACHE BOOL "enable/disable Win32 waveout plugin")
 
 IF(USE_ALSA)
 add_subdirectory(alsa)
@@ -18,3 +19,7 @@ ENDIF(USE_OSS)
 IF(USE_PULSE)
 add_subdirectory(pulseaudio)
 ENDIF(USE_PULSE)
+
+IF(USE_WAVEOUT)
+add_subdirectory(waveout)
+ENDIF(USE_WAVEOUT)
diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt
index 53107498c..327151e69 100644
--- a/src/plugins/Output/alsa/CMakeLists.txt
+++ b/src/plugins/Output/alsa/CMakeLists.txt
@@ -61,7 +61,7 @@ QT4_WRAP_UI(libalsa_UIS_H ${libalsa_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(ALSA_FOUND)
-ADD_LIBRARY(alsa SHARED ${libalsa_SRCS} ${libalsa_MOC_SRCS} ${libalsa_UIS_H}
+ADD_LIBRARY(alsa MODULE ${libalsa_SRCS} ${libalsa_MOC_SRCS} ${libalsa_UIS_H}
   ${libalsa_RCC_SRCS})
 add_dependencies(alsa qmmp)
 target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp ${ALSA_LDFLAGS} ${ALSA_CFLAGS})
diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt
index 52534f2ba..714f88a60 100644
--- a/src/plugins/Output/jack/CMakeLists.txt
+++ b/src/plugins/Output/jack/CMakeLists.txt
@@ -51,7 +51,7 @@ QT4_WRAP_CPP(libjack_MOC_SRCS ${libjack_MOC_HDRS})
 
 
 IF(JACK_FOUND)
-ADD_LIBRARY(jack SHARED ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS})
+ADD_LIBRARY(jack MODULE ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS})
 add_dependencies(jack qmmp)
 target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LDFLAGS} ${JACK_CFLAGS})
 install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output)
diff --git a/src/plugins/Output/oss/CMakeLists.txt b/src/plugins/Output/oss/CMakeLists.txt
index 45c743fdf..fb186b9f2 100644
--- a/src/plugins/Output/oss/CMakeLists.txt
+++ b/src/plugins/Output/oss/CMakeLists.txt
@@ -57,7 +57,7 @@ SET(liboss_UIS
 
 QT4_WRAP_UI(liboss_UIS_H ${liboss_UIS})
 
-ADD_LIBRARY(oss SHARED ${liboss_SRCS} ${liboss_MOC_SRCS} ${liboss_UIS_H}
+ADD_LIBRARY(oss MODULE ${liboss_SRCS} ${liboss_MOC_SRCS} ${liboss_UIS_H}
   ${liboss_RCC_SRCS})
 add_dependencies(oss qmmp)
 target_link_libraries(oss ${QT_LIBRARIES} -lqmmp)
diff --git a/src/plugins/Output/pulseaudio/CMakeLists.txt b/src/plugins/Output/pulseaudio/CMakeLists.txt
index 5c772d263..c3072e4d5 100644
--- a/src/plugins/Output/pulseaudio/CMakeLists.txt
+++ b/src/plugins/Output/pulseaudio/CMakeLists.txt
@@ -53,7 +53,7 @@ QT4_WRAP_CPP(libpulseaudio_MOC_SRCS ${libpulseaudio_MOC_HDRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(PULSE_FOUND)
-ADD_LIBRARY(pulseaudio SHARED ${libpulseaudio_SRCS} ${libpulseaudio_MOC_SRCS} ${libpulseaudio_UIS_H}
+ADD_LIBRARY(pulseaudio MODULE ${libpulseaudio_SRCS} ${libpulseaudio_MOC_SRCS} ${libpulseaudio_UIS_H}
   ${libpulseaudio_RCC_SRCS})
 add_dependencies(pulseaudio qmmp)
 target_link_libraries(pulseaudio ${QT_LIBRARIES} -lqmmp ${PULSE_LDFLAGS} ${PULSE_CFLAGS})
diff --git a/src/plugins/Output/waveout/CMakeLists.txt b/src/plugins/Output/waveout/CMakeLists.txt
new file mode 100644
index 000000000..90901985e
--- /dev/null
+++ b/src/plugins/Output/waveout/CMakeLists.txt
@@ -0,0 +1,54 @@
+project(libwaveout)
+
+cmake_minimum_required(VERSION 2.4.7)
+
+if(COMMAND cmake_policy)
+cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../../
+)
+
+# libqmmp
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
+
+# Win32 waveout
+CHECK_INCLUDE_FILE(windows.h WINDOWS_H_FOUND)
+
+SET(libwaveout_SRCS
+  outputwaveout.cpp
+  outputwaveoutfactory.cpp
+)
+
+SET(libwaveout_MOC_HDRS
+  outputwaveout.h
+  outputwaveoutfactory.h
+)
+
+SET(libwaveout_RCCS translations/translations.qrc)
+
+QT4_ADD_RESOURCES(libwaveout_RCC_SRCS ${libwaveout_RCCS})
+
+QT4_WRAP_CPP(libwaveout_MOC_SRCS ${libwaveout_MOC_HDRS})
+
+
+IF(WINDOWS_H_FOUND)
+ADD_LIBRARY(waveout MODULE ${libwaveout_SRCS} ${libwaveout_MOC_SRCS} ${libwaveout_RCC_SRCS})
+add_dependencies(waveout qmmp)
+target_link_libraries(waveout ${QT_LIBRARIES} -lqmmp -lwinmm)
+install(TARGETS waveout DESTINATION ${LIB_DIR}/qmmp/Output)
+ENDIF(WINDOWS_H_FOUND)
+