ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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
This commit is contained in:
Tim Mayberry 2006-03-04 11:26:25 +00:00
parent 2f30610d8e
commit 7df20e1166
11 changed files with 34 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConstruct
View File

@ -439,6 +439,7 @@ if env['SYSLIBS']:
LIBPATH='#libs/soundtouch',
CPPPATH=['#libs', '#libs/soundtouch'])
coredirs = [
'libs/soundtouch',
'templates'
]

19
gtk2_ardour/ardbg
View File

@ -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

19
gtk2_ardour/ardev
View File

@ -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 $*

3
gtk2_ardour/ardour_ui.cc
View File

@ -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;

8
gtk2_ardour/arval
View File

@ -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 $*

2
libs/ardour/destructive_filesource.cc
View File

@ -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;

2
libs/glibmm2/SConscript
View File

@ -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)

5
libs/gtkmm2ext/SConscript
View File

@ -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)

6
libs/midi++2/SConscript
View File

@ -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'],

6
libs/pbd3/SConscript
View File

@ -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'],

12
libs/soundtouch/SConscript
View File

@ -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')))