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 #include + +#if defined(HAVE_ASIO) #include +#endif /*! \brief A PortAudio Devices manager. diff --git a/wscript b/wscript index 174e81c0..f0c10b4a 100644 --- 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)