diff options
| -rw-r--r-- | SConstruct | 1 | ||||
| -rwxr-xr-x | gtk2_ardour/ardbg | 19 | ||||
| -rwxr-xr-x | gtk2_ardour/ardev | 19 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 3 | ||||
| -rwxr-xr-x | gtk2_ardour/arval | 8 | ||||
| -rw-r--r-- | libs/ardour/destructive_filesource.cc | 2 | ||||
| -rw-r--r-- | libs/glibmm2/SConscript | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/SConscript | 5 | ||||
| -rw-r--r-- | libs/midi++2/SConscript | 6 | ||||
| -rw-r--r-- | libs/pbd3/SConscript | 6 | ||||
| -rw-r--r-- | libs/soundtouch/SConscript | 12 |
11 files changed, 34 insertions, 49 deletions
diff --git a/SConstruct b/SConstruct index 96cdf25d10..c8cc324c18 100644 --- a/SConstruct +++ b/SConstruct @@ -439,6 +439,7 @@ if env['SYSLIBS']: LIBPATH='#libs/soundtouch', CPPPATH=['#libs', '#libs/soundtouch']) coredirs = [ + 'libs/soundtouch', 'templates' ] diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg index 0aa19ac5e7..267fdbae73 100755 --- a/gtk2_ardour/ardbg +++ b/gtk2_ardour/ardbg @@ -1,18 +1,3 @@ #!/bin/sh - -export ARDOUR_RC=../ardour.rc -export ARDOUR_GLADE_PATH=./glade -export ARDOUR_UI=./ardour.menus -export ARDOUR_UI_RC=./ardour2_ui.rc -export ARDOUR_BINDINGS=./ardour.bindings - -if [ -x ./ardour.bin ] ; then - # scons executable - export LD_LIBRARY_PATH=../libs/ardour:$LD_LIBRARY_PATH - exec gdb ./ardour.bin -else - # autofoo/make executable - export LD_LIBRARY_PATH=../libs/ardour/.libs:$LD_LIBRARY_PATH - exec gdb ./ardour -fi - +source ardev_common.sh +exec gdb ./ardour.bin diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev index e32d882d63..017a7e337d 100755 --- a/gtk2_ardour/ardev +++ b/gtk2_ardour/ardev @@ -1,19 +1,4 @@ #!/bin/sh -#export G_DEBUG=fatal_criticals -export ARDOUR_RC=../ardour.rc -export ARDOUR_GLADE_PATH=./glade -export ARDOUR_UI=./ardour.menus -export ARDOUR_UI_RC=./ardour2_ui.rc -export ARDOUR_BINDINGS=./ardour.bindings - -if [ -x ./ardour.bin ] ; then - # scons executable - export LD_LIBRARY_PATH=../libs/ardour - exec ./ardour.bin --novst $* -else - # autofoo/make executable - export LD_LIBRARY_PATH=../libs/ardour - exec ./ardour --novst $* -fi - +source ardev_common.sh +exec ./ardour.bin --novst $* diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b66d481682..752a6f693d 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -151,6 +151,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) if(!Glib::file_test(color_file, Glib::FILE_TEST_EXISTS)) { color_file = ARDOUR::find_config_file("ardour.colors"); } + + cerr << "Loading UI color configuration file " << color_file << endl; + color_manager->load (color_file); m_new_session_dialog = 0; diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval index f560d4e336..5254ad4df0 100755 --- a/gtk2_ardour/arval +++ b/gtk2_ardour/arval @@ -1,9 +1,3 @@ #!/bin/sh - -export ARDOUR_GLADE_PATH=./glade -export ARDOUR_UI=./ardour.menus -export ARDOUR_UI_RC=./ardour2_ui.rc -export ARDOUR_BINDINGS=./ardour.bindings - -export LD_LIBRARY_PATH=../libs/ardour:$LD_LIBRARY_PATH +source ardev_common.sh exec valgrind --num-callers=12 --tool=memcheck ./ardour.bin --novst $* diff --git a/libs/ardour/destructive_filesource.cc b/libs/ardour/destructive_filesource.cc index 8604d5d84e..c18fedd982 100644 --- a/libs/ardour/destructive_filesource.cc +++ b/libs/ardour/destructive_filesource.cc @@ -327,7 +327,7 @@ DestructiveFileSource::write (Sample* data, jack_nframes_t cnt, char * workbuf) } file_pos += cnt; - cerr << this << ' ' << _name << " at end of write, file_pos = " << file_pos << " length = " << ((int) &_length - (int) this) << ' ' << &_length << ' ' << _length << endl; + //cerr << this << ' ' << _name << " at end of write, file_pos = " << file_pos << " length = " << ((int) &_length - (int) this) << ' ' << &_length << ' ' << _length << endl; if (_build_peakfiles) { PeakBuildRecord *pbr = 0; diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript index 99524f2f5a..248a8f2a4a 100644 --- a/libs/glibmm2/SConscript +++ b/libs/glibmm2/SConscript @@ -9,7 +9,7 @@ glibmm2 = env.Copy() glibmm2.Merge([libraries['sigc2'], libraries['glib2']]) glibmm2.Append(CXXFLAGS='-DHAVE_CONFIG_H') -glibmm2.Append(CXXFLAGS='-DG_DISABLE_DEPRECATED') +#glibmm2.Append(CXXFLAGS='-DG_DISABLE_DEPRECATED') glibmm2.Append(CXXFLAGS='-DG_LOG_DOMAIN=\\\"glibmm\\\"') libglibmm2 = glibmm2.StaticLibrary('glibmm2', glibmm2_files) diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript index 8b3367e46c..c92f908a85 100644 --- a/libs/gtkmm2ext/SConscript +++ b/libs/gtkmm2ext/SConscript @@ -61,7 +61,10 @@ gtkmm2ext.VersionBuild(['version.cc','gtkmm2ext/version.h'], 'SConscript') gtkmm2ext.Append(CCFLAGS="-D_REENTRANT") gtkmm2ext.Append(CCFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") -libgtkmm2ext = gtkmm2ext.StaticLibrary('gtkmm2ext', gtkmm2ext_files) +if env['DEVBUILD']: + libgtkmm2ext = gtkmm2ext.SharedLibrary('gtkmm2ext', gtkmm2ext_files) +else: + libgtkmm2ext = gtkmm2ext.StaticLibrary('gtkmm2ext', gtkmm2ext_files) Default(libgtkmm2ext) diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript index 1a0f887459..fe02a8d059 100644 --- a/libs/midi++2/SConscript +++ b/libs/midi++2/SConscript @@ -44,7 +44,11 @@ midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") midi2.VersionBuild(['version.cc','midi++/version.h'], 'SConscript') -libmidi2 = midi2.StaticLibrary('midi++', [ sources, sysdep_src ]) +if env['DEVBUILD']: + libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ]) +else: + libmidi2 = midi2.StaticLibrary('midi++', [ sources, sysdep_src ]) + Default(libmidi2) env.Alias('tarball', env.Distribute (env['DISTTREE'], diff --git a/libs/pbd3/SConscript b/libs/pbd3/SConscript index 995bc8b933..46089248e7 100644 --- a/libs/pbd3/SConscript +++ b/libs/pbd3/SConscript @@ -43,7 +43,11 @@ pbd3.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") pbd3.VersionBuild(['version.cc','pbd/version.h'], 'SConscript') -libpbd3 = pbd3.StaticLibrary('pbd', pbd3_files) +if env['DEVBUILD']: + libpbd3 = pbd3.SharedLibrary('pbd', pbd3_files) +else: + libpbd3 = pbd3.StaticLibrary('pbd', pbd3_files) + Default(libpbd3) env.Alias('tarball', env.Distribute (env['DISTTREE'], 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'))) + |