From: robiwan <robiwan@0f58301d-fd10-0410-b4af-bbb618454e57>
Date: Fri, 29 Jun 2012 12:30:43 +0000 (+0000)
Subject: Changes to make compilation/linking work on Mingw
X-Git-Tag: pa_stable_v19_20140130_r1919~55
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=1cc4bbbf9a36f2882e450c7b06269ea11265526e;p=portaudio

Changes to make compilation/linking work on Mingw
---

diff --git a/configure b/configure
index fd9f886..103ff13 100755
Binary files a/configure and b/configure differ
diff --git a/configure.in b/configure.in
index 792cbba..897de27 100644
--- 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 a830f76..47e4f10 100644
--- 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
 #endif
 #include <winioctl.h>						// MinGW32 does not define this automatically
+
+#if defined(__GNUC__)
+
+#include "../../hostapi/wasapi/mingw-include/ks.h"
+#include "../../hostapi/wasapi/mingw-include/ksmedia.h"
+
+#else
+
 #include <ks.h>
 #include <ksmedia.h>
+
+#endif
+
 #include <stdio.h>                          // just for some development printfs
 
 #include "portaudio.h"
 #include "pa_util.h"
 #include "pa_win_wdmks_utils.h"
 
-#if !defined(PA_WDMKS_NO_KSGUID_LIB) && !defined(PAWIN_WDMKS_NO_KSGUID_LIB)
+#if !defined(PA_WDMKS_NO_KSGUID_LIB) && !defined(PAWIN_WDMKS_NO_KSGUID_LIB) && !defined(__GNUC__)
     #if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
         #pragma comment( lib, "ksguid.lib" )
     #endif