From b0d25b67e71f39d7cea1460cca84939ad03b3984 Mon Sep 17 00:00:00 2001 From: Martin Koegler Date: Sat, 25 Jan 2014 16:05:22 +0000 Subject: [PATCH 1/3] Detect tre as regexp library replacement --- common/wscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/wscript b/common/wscript index cc2ab567..4302b1e2 100644 --- a/common/wscript +++ b/common/wscript @@ -15,7 +15,10 @@ def configure(conf): conf.env['BUILD_ADAPTER'] = conf.is_defined('HAVE_SAMPLERATE') if conf.env['IS_WINDOWS']: - conf.check_cc(function_name='regcomp', header_name='regex.h', lib='regex', uselib_store="REGEX", define_name='HAVE_REGEX_H') + try: + conf.check_cc(function_name='regcomp', header_name='regex.h', lib='regex', uselib_store="REGEX", define_name='HAVE_REGEX_H') + except: + conf.check_cc(function_name='regcomp', header_name='regex.h', lib='tre', uselib_store="REGEX", define_name='HAVE_REGEX_H') conf.check_cc(function_name='htons', header_name='winsock2.h', lib='ws2_32', uselib_store="WS2_32", define_name='HAVE_WINSOCK2_H') conf.check_cc(function_name='timeGetDevCaps', header_name=['windows.h', 'mmsystem.h'], lib='winmm', uselib_store="WINMM", define_name='HAVE_MMSYSTEM_H') conf.check_cc(function_name='EnumProcesses', header_name=['windows.h', 'psapi.h'], lib='psapi', uselib_store="PSAPI", define_name='HAVE_PSAPI_H') From ff9bb7b4dde82b4a171f834109b6d82d713a4279 Mon Sep 17 00:00:00 2001 From: Martin Koegler Date: Sat, 25 Jan 2014 16:05:58 +0000 Subject: [PATCH 2/3] Add missing windows build script --- windows/wscript | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 windows/wscript diff --git a/windows/wscript b/windows/wscript new file mode 100644 index 00000000..fdae9bb2 --- /dev/null +++ b/windows/wscript @@ -0,0 +1,14 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import Build +import re +import os + +def configure(conf): + conf.check_cc(function_name='Pa_GetVersion', header_name='portaudio.h', lib='portaudio', uselib_store="PORTAUDIO", define_name='HAVE_PORTAUDIO') + conf.env['BUILD_DRIVER_PORTAUDIO'] = conf.is_defined('HAVE_PORTAUDIO') + +def build(bld): + print "" + From 543686cb93e6e2d357e7135ad04c2cf972be1ba1 Mon Sep 17 00:00:00 2001 From: Martin Koegler Date: Sat, 25 Jan 2014 16:38:41 +0000 Subject: [PATCH 3/3] Fix example client for mingw build --- example-clients/midi_dump.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/example-clients/midi_dump.c b/example-clients/midi_dump.c index 3785a445..503af59d 100644 --- a/example-clients/midi_dump.c +++ b/example-clients/midi_dump.c @@ -4,10 +4,15 @@ #include #include #include +#include #include #include #include +#ifdef __MINGW32__ +#include +#endif + #ifndef WIN32 #include #include