summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-05-03 20:51:08 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-05-03 20:51:08 +0000
commit5e6703c481f7ffdbb7f467d7716c2eb2619b50ea (patch)
tree863ce372de45137bf1ed8b43f1cc74bda5f85d7e
parent979b95a56e0ef76238513ecb42a3b9e7f4be2e58 (diff)
dmalloc link support
git-svn-id: svn://localhost/trunk/ardour2@491 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--SConstruct20
-rw-r--r--gtk2_ardour/SConscript4
2 files changed, 23 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 1af4cb2a8a..be96ad0699 100644
--- a/SConstruct
+++ b/SConstruct
@@ -35,7 +35,8 @@ opts.AddOptions(
EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
- BoolOption('SURFACES', 'Build support for control surfaces', 0)
+ BoolOption('SURFACES', 'Build support for control surfaces', 0),
+ BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0)
)
#----------------------------------------------------------------------
@@ -415,6 +416,23 @@ else:
libraries['usb'] = conf.Finish ()
#
+# Check for dmalloc
+
+libraries['dmalloc'] = LibraryInfo ()
+
+#
+# look for the threaded version
+#
+
+conf = Configure (libraries['dmalloc'])
+if conf.CheckLib ('dmallocth', 'dmalloc_shutdown'):
+ have_libdmalloc = True
+else:
+ have_libdmalloc = False
+
+libraries['dmalloc'] = conf.Finish ()
+
+#
#
# Audio/MIDI library (needed for MIDI, since audio is all handled via JACK)
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index d2959e442e..e490778476 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -49,6 +49,10 @@ gtkardour.Merge ([
libraries['libglademm']
])
+if gtkardour['DMALLOC']:
+ gtkardour.Merge([libraries['dmalloc']])
+ gtkardour.Append(CCFLAGS='-DUSE_DMALLOC')
+
if gtkardour['FFT_ANALYSIS']:
gtkardour.Merge ([libraries['fftw3f']])
gtkardour.Append(CCFLAGS='-DFFT_ANALYSIS')