Better handling of optional asio

Signed-off-by: falkTX <falktx@falktx.com>
jackaudio · Jan 15, 2022 · 66f9bdb · 66f9bdb
1 parent fd562bd
commit 66f9bdb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/windows/JackTypes_os.h b/windows/JackTypes_os.h
@@ -31,9 +31,5 @@ typedef UInt64 uint64_t;
 typedef unsigned short uint16_t;
 typedef DWORD jack_tls_key;
 
-#if defined(__MINGW32__)
-#define PRIu64 "llu"
-#endif
-
 #endif
 
diff --git a/windows/portaudio/JackPortAudioDevices.h b/windows/portaudio/JackPortAudioDevices.h
@@ -24,7 +24,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <string>
 
 #include <portaudio.h>
+
+#if defined(HAVE_ASIO)
 #include <pa_asio.h>
+#endif
 
 /*!
 \brief A PortAudio Devices manager.

diff --git a/wscript b/wscript
@@ -221,9 +221,8 @@ def configure(conf):
         if Options.options.platform in ('msys', 'win32'):
             conf.env.append_value('INCLUDES', ['/mingw64/include'])
             conf.check(
-                header_name='asio.h',
-                includes='/opt/asiosdk/common',
-                msg='Checking for ASIO SDK',
+                header_name='pa_asio.h',
+                msg='Checking for PortAudio ASIO support',
                 define_name='HAVE_ASIO',
                 mandatory=False)