diff options
| author | falkTX <falktx@falktx.com> | 2020-06-13 23:16:14 +0100 |
|---|---|---|
| committer | falkTX <falktx@falktx.com> | 2020-06-13 23:16:14 +0100 |
| commit | 33c58494678a1496d50e2d54f76eea76832afb13 (patch) | |
| tree | 1cb784bd3e26f8c17b6c84c72144d6b6974c41f6 | |
| parent | a11c6995e4b876f9592018339c81d73b22fc1e87 (diff) | |
| download | jack2-33c58494678a1496d50e2d54f76eea76832afb13.tar.gz | |
Use proper path to tre/regex; Fixup wscript a bit
| -rw-r--r-- | common/JackGraphManager.cpp | 4 | ||||
| -rw-r--r-- | common/wscript | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/common/JackGraphManager.cpp b/common/JackGraphManager.cpp index 4d5061b5..713c6747 100644 --- a/common/JackGraphManager.cpp +++ b/common/JackGraphManager.cpp @@ -24,7 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <assert.h> #include <stdlib.h> #include <algorithm> +#ifdef HAVE_TRE_REGEX_H +#include <tre/regex.h> +#else #include <regex.h> +#endif namespace Jack { diff --git a/common/wscript b/common/wscript index 3ce17634..11707063 100644 --- a/common/wscript +++ b/common/wscript @@ -10,12 +10,12 @@ def configure(conf): if conf.env['IS_WINDOWS']: try: - conf.check(function_name='regcomp', header_name='regex.h', lib='regex', uselib_store='REGEX', define_name='HAVE_REGEX_H') + conf.check(header_name='regex.h', lib='regex', uselib_store='REGEX', define_name='HAVE_REGEX_H') except: - conf.check(function_name='regcomp', header_name='regex.h', lib='tre', uselib_store='REGEX', define_name='HAVE_REGEX_H') - conf.check(function_name='htons', header_name='winsock2.h', lib='ws2_32', uselib_store='WS2_32', define_name='HAVE_WINSOCK2_H') - conf.check(function_name='timeGetDevCaps', header_name=['windows.h', 'mmsystem.h'], lib='winmm', uselib_store='WINMM', define_name='HAVE_MMSYSTEM_H') - conf.check(function_name='EnumProcesses', header_name=['windows.h', 'psapi.h'], lib='psapi', uselib_store='PSAPI', define_name='HAVE_PSAPI_H') + conf.check(header_name='tre/regex.h', lib='tre', uselib_store='REGEX', define_name='HAVE_TRE_REGEX_H') + conf.check(header_name='winsock2.h', lib='ws2_32', uselib_store='WS2_32', define_name='HAVE_WINSOCK2_H') + conf.check(header_name=['windows.h', 'mmsystem.h'], lib='winmm', uselib_store='WINMM', define_name='HAVE_MMSYSTEM_H') + conf.check(header_name=['windows.h', 'psapi.h'], lib='psapi', uselib_store='PSAPI', define_name='HAVE_PSAPI_H') def create_jack_process_obj(bld, target, sources, uselib = None, framework = None): process = bld(features = ['cxx', 'cxxshlib']) @@ -74,7 +74,7 @@ def build(bld): includes.append('..') else: includes.append('../..') - uselib = ['PTHREAD', 'CELT', 'OPUS', 'DB'] + uselib = ['CELT', 'OPUS', 'DB', 'PTHREAD'] if bld.env['IS_LINUX']: common_libsources += [ |