diff options
| author | falkTX <falktx@falktx.com> | 2021-07-28 20:34:51 +0100 |
|---|---|---|
| committer | falkTX <falktx@falktx.com> | 2021-07-28 20:34:51 +0100 |
| commit | 70488cf2d0f66e7507732a6d8064d7890e674ec7 (patch) | |
| tree | 6d3c56d64ed566d261a19e3a66808c0c3232d0fd | |
| parent | caf336a6bc68ad0a8414ce1b6e40d40707cbc873 (diff) | |
| download | jack2-70488cf2d0f66e7507732a6d8064d7890e674ec7.tar.gz | |
Better handling of optional asio
Signed-off-by: falkTX <falktx@falktx.com>
| -rw-r--r-- | windows/JackTypes_os.h | 4 | ||||
| -rw-r--r-- | windows/portaudio/JackPortAudioDevices.h | 3 | ||||
| -rw-r--r-- | wscript | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/windows/JackTypes_os.h b/windows/JackTypes_os.h index 3a5f4dc4..90327493 100644 --- 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 index 93af2541..fa1fd3bb 100644 --- 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. @@ -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) |