From a659398ff1f76b1c4a74edd00866e5cf84a68a00 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 23 May 2008 18:13:33 +0000
Subject: [PATCH] Tim Blechmann patch

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2330 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 SConstruct                | 14 ++++++++++++++
 common/JackEngine.h       |  4 ++--
 common/JackLockedEngine.h |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index f8fb1c28..9c1ba085 100644
--- a/SConstruct
+++ b/SConstruct
@@ -81,6 +81,9 @@ opts.AddOptions(
     BoolOption('BUILD_EXAMPLES', 'Build the example clients in their directory', True),
     BoolOption('INSTALL_EXAMPLES', 'Install the example clients in the BINDIR directory', True),
     BoolOption('BUILD_DOXYGEN_DOCS', 'Build doxygen documentation', False),
+    ('cc', 'cc', False),
+    ('cxx', 'cxx', False),
+    ('ccflags', 'ccflags', False),
     )
 
 #
@@ -109,6 +112,17 @@ env = Environment(tools=['default', 'scanreplace', 'pkgconfig', 'doxygen'], tool
 Help('To build jackdmp you can set different options as listed below. You have to specify them only once, scons will save the latest values you set and re-use then. To really undo your settings and return to the factory defaults, remove the .sconsign.dblite and options.cache files from your BUILDDIR directory.')
 Help(opts.GenerateHelpText(env))
 
+# update build settings
+if env['cc']:
+    env['CC'] = env['cc']
+
+if env['cxx']:
+    env['CXX'] = env['cxx']
+
+if env['ccflags']:
+    env.Append(CCFLAGS=env['ccflags'])
+
+
 # Set version
 env['JACK_MAJOR_VERSION'] = JACK_MAJOR_VERSION
 env['JACK_MINOR_VERSION'] = JACK_MINOR_VERSION
diff --git a/common/JackEngine.h b/common/JackEngine.h
index f294f5d1..ad24573f 100644
--- a/common/JackEngine.h
+++ b/common/JackEngine.h
@@ -94,7 +94,7 @@ class JackEngineInterface
 \brief Engine description.
 */
 
-class JackEngine : public JackEngineInterface
+class JackEngine 
 {
     private:
 
@@ -127,7 +127,7 @@ class JackEngine : public JackEngineInterface
     public:
 
         JackEngine(JackGraphManager* manager, JackSynchro** table, JackEngineControl* controler);
-        virtual ~JackEngine();
+        ~JackEngine();
 
         int Open();
         int Close();
diff --git a/common/JackLockedEngine.h b/common/JackLockedEngine.h
index a78ac4dc..86e941f6 100644
--- a/common/JackLockedEngine.h
+++ b/common/JackLockedEngine.h
@@ -41,7 +41,7 @@ class JackLockedEngine : public JackEngineInterface, public JackLockAble
         JackLockedEngine(JackGraphManager* manager, JackSynchro** table, JackEngineControl* controler):
             fEngine(manager, table, controler)
         {}
-        virtual ~JackLockedEngine()
+        ~JackLockedEngine()
         {}
 
         int Open()