Changes to make compilation/linking work on Mingw

diff --git a/configure b/configure
index fd9f88635b7f3ceea317e6865caf4d2e43d48a28..103ff13db339a40be08d15c0c59e4e9676f3dec7 100755 (executable)
Binary files a/configure and b/configure differ

diff --git a/configure.in b/configure.in
index 792cbbac2b8655dd7d66c5c5ece547403439d83f..897de27a720a86852aa8f859174892752c287774 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -272,7 +272,7 @@ case "${host_os}" in
 
         if [[ "x$with_wdmks" = "xyes" ]]; then
             DXDIR="$with_dxdir"
-            add_objects src/hostapi/wdmks/pa_win_wdmks.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o
+            add_objects src/hostapi/wdmks/pa_win_wdmks.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_wdmks_util.o src/os/win/pa_win_waveformat.o
             LIBS="-lwinmm -lm -luuid -lsetupapi -lole32"
             DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -luuid -lsetupapi -lole32"
             #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""

diff --git a/src/os/win/pa_win_wdmks_utils.c b/src/os/win/pa_win_wdmks_utils.c
index a830f76dfda6dece726e1f49ec4d39a68403aaa5..47e4f10b1622b81397c5a0dc08a7f60b327cc31f 100644 (file)
--- a/src/os/win/pa_win_wdmks_utils.c
+++ b/src/os/win/pa_win_wdmks_utils.c
@@ -47,15 +47,26 @@
     #define _INC_MMREG                      // for STATIC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT\r
 #endif\r
 #include <winioctl.h>                                          // MinGW32 does not define this automatically\r
+\r
+#if defined(__GNUC__)\r
+\r
+#include "../../hostapi/wasapi/mingw-include/ks.h"\r
+#include "../../hostapi/wasapi/mingw-include/ksmedia.h"\r
+\r
+#else\r
+\r
 #include <ks.h>\r
 #include <ksmedia.h>\r
+\r
+#endif\r
+\r
 #include <stdio.h>                          // just for some development printfs\r
 \r
 #include "portaudio.h"\r
 #include "pa_util.h"\r
 #include "pa_win_wdmks_utils.h"\r
 \r
-#if !defined(PA_WDMKS_NO_KSGUID_LIB) && !defined(PAWIN_WDMKS_NO_KSGUID_LIB)\r
+#if !defined(PA_WDMKS_NO_KSGUID_LIB) && !defined(PAWIN_WDMKS_NO_KSGUID_LIB) && !defined(__GNUC__)\r
     #if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */\r
         #pragma comment( lib, "ksguid.lib" )\r
     #endif\r