summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-07-03 22:24:32 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-07-03 22:24:32 +0000
commit2e70415417862918e4900ec27bd82afdb3ce18ff (patch)
treeb56bf6da8803069922fd03ffea9541ec89adb625
parent3e70b965971ca2b08dad5f76c58f5d13ebc20a2c (diff)
set powermate env keys in SConstruct, so that POWERMATE is set even if SURFACES=false
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2102 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--SConstruct5
-rw-r--r--svn_revision.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index c2db8547d5..444095eab5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1011,7 +1011,10 @@ if env['SURFACES']:
if os.access ('libs/surfaces/sony9pin', os.F_OK):
surface_subdirs += [ 'libs/surfaces/sony9pin' ]
-
+else:
+ env['POWERMATE'] = 0
+ env['TRANZPORT'] = 0
+
opts.Save('scache.conf', env)
Help(opts.GenerateHelpText(env))
diff --git a/svn_revision.h b/svn_revision.h
index 4bfd4f2ac0..fb1ea6ad9c 100644
--- a/svn_revision.h
+++ b/svn_revision.h
@@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__
-static const char* ardour_svn_revision = "1801";
+static const char* ardour_svn_revision = "2094";
#endif