Various configure and Makefile changes for MinGW (gps).

4 files changed, 27 insertions, 9 deletions

diff --git a/Makefile.in b/Makefile.in
index f658377..dfebb0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,4 @@
+### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
 ### RtAudio library Makefile
 
 RM = /bin/rm
diff --git a/configure.ac b/configure.ac
index 7141656..78eb85a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,12 +85,6 @@ case $host in
   fi
   ;;
 
-  *-sgi*)
-  AC_SUBST( audio_apis, ["-D__IRIX_AL__ -LANG:std -w"] )
-  AC_MSG_RESULT(using IRIX AL)
-  AC_CHECK_LIB(audio, alOpenPort, , AC_MSG_ERROR(IRIX audio support requires the audio library!) )
-  ;;
-
   *-apple*)
   AC_SUBST( sound_api, [_NO_API_] )
   AC_ARG_WITH(jack, [  --with-jack = choose JACK server support (unix only)], [AC_SUBST( sound_api, [-D__UNIX_JACK__] ) AC_MSG_RESULT(using JACK)], )
@@ -118,6 +112,27 @@ case $host in
   fi
   ;;
 
+  *-mingw32*)
+  AC_SUBST( sound_api, [_NO_API_] )
+  AC_ARG_WITH(asio, [  --with-asio = choose ASIO API support (windoze only)], [AC_SUBST( sound_api, [-D__WINDOWS_ASIO__] ) AC_MSG_RESULT(using ASIO)], )
+  if [test $sound_api = -D__UNIX_ASIO__;] then
+    audio_apis="-D__WINDOWS_ASIO__"
+  fi
+
+  # Look for DirectSound flag
+  AC_ARG_WITH(ds, [  --with-ds = choose DirectSound API support (windoze only)], [AC_SUBST( sound_api, [-D__WINDOWS_DS__] ) AC_MSG_RESULT(using DirectSound)], )
+  if test $sound_api = -D__WINDOWS_DS__; then
+    audio_apis="-D__WINDOWS_DS__ $audio_apis"
+  fi
+
+  # If no audio api flags specified, use DirectSound
+  if [test $sound_api = _NO_API_;] then
+    AC_SUBST( sound_api, [-D__WINDOWS_DS__] )
+    AC_MSG_RESULT(using DirectSound)
+    audio_apis="-D__WINDOWS_DS__"
+  fi
+  ;;
+
   *)
   # Default case for unknown realtime systems.
   AC_MSG_ERROR(Unknown system type for realtime support!)
diff --git a/install b/install
index c161713..89788be 100644
--- a/install
+++ b/install
@@ -2,7 +2,7 @@ RtAudio - a set of C++ classes which provide a common API for realtime audio inp
 
 By Gary P. Scavone, 2001-2007.
 
-To configure and compile (on Unix systems):
+To configure and compile (on Unix systems and MinGW):
 
 1. Unpack the RtAudio distribution (tar -xzf rtaudio-x.x.tar.gz).
 2. From within the directory containing this file, run configure:
@@ -18,6 +18,8 @@ A few options can be passed to configure, including:
   --with-oss = choose OSS API support (linux only)
   --with-jack = choose JACK server support (linux or Macintosh OS-X)
   --with-core = choose CoreAudio API support (Macintosh OS-X only)
+  --with-asio = choose ASIO API support (windows only)
+  --with-ds = choose DirectSound API support (windows only)
 
 Typing "./configure --help" will display all the available options.  Note that you can provide more than one "--with-" flag to the configure script to enable multiple API support.
 
@@ -25,7 +27,6 @@ If you wish to use a different compiler than that selected by configure, specify
 
   ./configure CXX=CC
 
-
 For Windows Users:
 
 Visual C++ 6.0 project files are included for the test programs in the /tests/Windows/ directory.  These projects compile API support for both ASIO and DirectSound.  Version 4.0 of RtAudio was tested with the .net compiler and it will not compile in Visual C++ 6.0 because of its non-conformance to modern C++ standards.
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 449dcf4..bc17be5 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,5 @@
-### RtAudio tests Makefile - for various flavors of unix
+### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
+### RtAudio tests Makefile - for various flavors of unix and MinGW
 
 PROGRAMS = audioprobe playsaw playraw record duplex testall
 RM = /bin/rm