Browse Source

Proper fix for mixed mode

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.9.14^2
falkTX 5 years ago
parent
commit
003f2deb4e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 8 additions and 4 deletions
  1. +4
    -0
      common/JackMetadata.h
  2. +4
    -4
      wscript

+ 4
- 0
common/JackMetadata.h View File

@@ -20,6 +20,10 @@
#ifndef __JackMetadata__
#define __JackMetadata__

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#include <stdint.h>

#if HAVE_DB


+ 4
- 4
wscript View File

@@ -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')



Loading…
Cancel
Save