diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-17 08:44:51 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-17 08:44:51 +0000 |
| commit | 1c299d5a5c493986ca4a19bd55a69281dabada86 (patch) | |
| tree | dae18913a2261a157ba32308ef804050e1232542 /SConstruct | |
| parent | 8e9a83dfdc233898e7c470667c7c9b797c83fe8b (diff) | |
merge Sakari's (sbergen) branch back into 3.0, removing libsndfile and adding taglib
git-svn-id: svn://localhost/ardour2/branches/3.0@3736 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index aae2040622..cfc44857b3 100644 --- a/SConstruct +++ b/SConstruct @@ -261,16 +261,16 @@ def create_stored_revision (target = None, source = None, env = None): if os.path.exists('.svn'): rev = fetch_svn_revision ('.'); try: - text = "#ifndef __ardour_svn_revision_h__\n" - text += "#define __ardour_svn_revision_h__\n" - text += "static const char* ardour_svn_revision = \"" + rev + "\";\n"; - text += "#endif\n" - print '============> writing svn revision info to svn_revision.h\n' - o = file ('svn_revision.h', 'w') + text = "#include <ardour/svn_revision.h>\n" + text += "namespace ARDOUR {\n"; + text += "extern const char* svn_revision = \"" + rev + "\";\n"; + text += "}\n"; + print '============> writing svn revision info to libs/ardour/svn_revision.cc\n' + o = file ('libs/ardour/svn_revision.cc', 'w') o.write (text) o.close () except IOError: - print "Could not open svn_revision.h for writing\n" + print "Could not open libs/ardour/svn_revision.cc for writing\n" sys.exit (-1) else: print "You cannot use \"scons revision\" on without using a checked out" @@ -1163,6 +1163,9 @@ else: libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', LIBPATH='#libs/libsndfile', CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) + libraries['taglib'] = LibraryInfo(LIBS='libtaglib', + LIBPATH='#libs/taglib', + CPPPATH=['#libs/taglib/headers','#libs/taglib/headers/taglib']) # libraries['libglademm'] = LibraryInfo(LIBS='libglademm', # LIBPATH='#libs/libglademm', # CPPPATH='#libs/libglademm') @@ -1178,6 +1181,7 @@ else: subdirs = [ 'libs/sigc++2', 'libs/libsndfile', + 'libs/taglib', 'libs/pbd', 'libs/midi++2', 'libs/ardour', @@ -1400,6 +1404,12 @@ env.AddPreAction (env['DISTTREE'], Action ('rm -rf ' + str (File (env['DISTTREE' env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE'])))) # +# Update revision info before going into subdirs +# + +create_stored_revision() + +# # the subdirs # |