diff options
| author | falkTX <falktx@falktx.com> | 2019-11-17 21:18:17 +0000 |
|---|---|---|
| committer | falkTX <falktx@falktx.com> | 2019-11-17 21:18:17 +0000 |
| commit | 003f2deb4eb938b2de7a3bff035f6a1171895b4b (patch) | |
| tree | cf60eadfb6b4e1551e7e11f23ee63c0364cc02d9 | |
| parent | 9b1c4e2cf29d793290bb95d87c7b962c3d336d7d (diff) | |
| download | jack2-003f2deb4eb938b2de7a3bff035f6a1171895b4b.tar.gz | |
Proper fix for mixed mode
Signed-off-by: falkTX <falktx@falktx.com>
| -rw-r--r-- | common/JackMetadata.h | 4 | ||||
| -rw-r--r-- | wscript | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/common/JackMetadata.h b/common/JackMetadata.h index cd66f8ac..7469737a 100644 --- a/common/JackMetadata.h +++ b/common/JackMetadata.h @@ -20,6 +20,10 @@ #ifndef __JackMetadata__ #define __JackMetadata__ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdint.h> #if HAVE_DB @@ -398,11 +398,11 @@ def configure(conf): else: conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib32' # libdb does not work in mixed mode - conf.env['HAVE_DB'] = 0 - conf.env['HAVE_DB_H'] = 0 - conf.env['LIB_DB'] = [] + conf.all_envs[lib32]['HAVE_DB'] = 0 + conf.all_envs[lib32]['HAVE_DB_H'] = 0 + conf.all_envs[lib32]['LIB_DB'] = [] # no need for opus in 32bit mixed mode clients - conf.env['LIB_OPUS'] = [] + conf.all_envs[lib32]['LIB_OPUS'] = [] # someone tell me where this file gets written please.. conf.write_config_header('config.h') |