diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2006-03-04 11:26:25 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2006-03-04 11:26:25 +0000 |
| commit | 7df20e1166b3c8878de5525cf3e8395f942e7177 (patch) | |
| tree | 7ffbc17060b6df7ce766192c8770ed060cce5422 /libs/soundtouch | |
| parent | 2f30610d8e0054c514e582979771466488969f74 (diff) | |
2006-03-04 Tim Mayberry <mojofunk@gmail.com>
* Remove debug output preventing compilation on x86_64.
* Build shared libraries for all libs/* when DEVBUILD=1 to fix linking for x86_64/non-x86.
* Simplify/consolidate the dev scripts a bit.
* Export ARDOUR_COLORS variable in dev scripts.
* Remove G_DISABLE_DEPRECATED from glibmm CXXFLAGS to allow compilation with newer versions of glib.
* Build soundtouch with SYSLIBS=1, hopefully we can link to system soundtouch soon.
git-svn-id: svn://localhost/trunk/ardour2@344 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/soundtouch')
| -rw-r--r-- | libs/soundtouch/SConscript | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libs/soundtouch/SConscript b/libs/soundtouch/SConscript index 12ce0b385c..0d8d9043b7 100644 --- a/libs/soundtouch/SConscript +++ b/libs/soundtouch/SConscript @@ -16,8 +16,14 @@ cpu_detect_x86_gcc.cpp Import('env') st = env.Copy() st.Append(CCFLAGS="-DHAVE_CONFIG_H -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE") -libst = st.StaticLibrary('soundtouch', soundtouch_files) + +if env['DEVBUILD']: + libst = st.SharedLibrary('soundtouch', soundtouch_files) +else: + libst = st.StaticLibrary('soundtouch', soundtouch_files) + Default(libst) -env.Alias('tarball', env.Distribute (env['DISTTREE'], - [ 'SConscript'] + soundtouch_files + glob.glob('*.h'))) +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript'] + soundtouch_files + glob.glob('*.h'))) + |