X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=0b7477f7a9cd954559e3409f0cd1e8950cb30dc2;hb=aba5317deff92ec5a4872ea17b69bbc4b1fb55b5;hp=322f1b49b8044eb2f10319ad7016746c96d81729;hpb=f9ba7c277eab1fd866097a88e583cde7239e575a;p=rtaudio-cdist.git

diff --git a/configure.ac b/configure.ac
index 322f1b4..0b7477f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,9 @@ AS_IF([test "x$systems" = "x"],
     [*-*-freebsd*],  [systems="oss"],
     [*-*-linux*],    [systems="alsa pulse jack oss"],
     [*-apple*],      [systems="core jack"],
-    [*-mingw32*],    [systems="asio ds wasapi jack"]
+    [*-mingw32*],    [systems="asio ds wasapi jack"],
+    [*-mingw64*],    [systems="asio ds wasapi jack"],
+    [*-msys*],       [systems="asio ds wasapi jack"],
   ))
 
 # If any were specifically requested disabled, do it.
@@ -259,7 +261,15 @@ AS_CASE(["$systems"], [*" asio "*], [
 ])
 
 AS_CASE(["$systems"], [*" ds "*], [
-  AC_CHECK_HEADERS(mmsystem.h mmreg.h dsound.h,
+  AC_CHECK_HEADERS(windows.h)
+  AC_CHECK_HEADERS(mmsystem.h mmreg.h dsound.h, [], [],
+[#ifdef HAVE_WINDOWS_H
+# include <windows.h>
+#endif])
+  AS_IF([test "x$ac_cv_header_windows_h" = xyes \
+      && test "x$ac_cv_header_mmsystem_h" = xyes \
+      && test "x$ac_cv_header_mmreg_h" = xyes \
+      && test "x$ac_cv_header_dsound_h" = xyes],
     [api="$api -D__WINDOWS_DS__"
      need_ole32=yes
      found="$found DirectSound"
@@ -267,12 +277,20 @@ AS_CASE(["$systems"], [*" ds "*], [
 ])
 
 AS_CASE(["$systems"], [*" wasapi "*], [
-  AC_CHECK_HEADERS(windows.h audioclient.h avrt.h mmdeviceapi.h,
+  AC_CHECK_HEADERS(windows.h)
+  AC_CHECK_HEADERS(audioclient.h avrt.h mmdeviceapi.h, [], [],
+[#ifdef HAVE_WINDOWS_H
+# include <windows.h>
+#endif])
+  AS_IF([test "x$ac_cv_header_windows_h" = xyes \
+      && test "x$ac_cv_header_audioclient_h" = xyes \
+      && test "x$ac_cv_header_avrt_h" = xyes \
+      && test "x$ac_cv_header_mmdeviceapi_h" = xyes],
     [api="$api -D__WINDOWS_WASAPI__"
      CPPFLAGS="-I$srcdir/include $CPPFLAGS"
      need_ole32=yes
      found="$found WASAPI"
-     LIBS="-lwinmm -luuid -lksuser $LIBS"])
+     LIBS="-lwinmm -lksuser -lmfplat -lmfuuid -lwmcodecdspuuid $LIBS"])
 ])
 
 AS_IF([test -n "$need_ole32"], [LIBS="-lole32 $LIBS"])