ardour/livetrax
13
0
Fork 0
Code

Upgrade to waf 1.5.4.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4991 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-04-18 16:15:12 +00:00
parent 588900a09b
commit 3ae378a17c
17 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/wscript
View File

@ -220,13 +220,13 @@ def build(bld):
obj.uselib += ' GTKMM GNOMECANVASMM'
obj.uselib_local = '''libpbd libmidipp libtaglib libardour libsurfaces
libgtkmm2ext libtaglib'''
obj.cxxflags = '-DVERSIONSTRING=\\\"' + GTK2_ARDOUR_VERSION + '\\\"'
obj.cxxflags += ' -DPACKAGE=\\\"gtk2_ardour\\\"'
obj.cxxflags += ' -DDATA_DIR=\\\"' + os.path.normpath(bld.env['DATADIRNAME']) + '\\\"'
obj.cxxflags += ' -DCONFIG_DIR=\\\"' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '\\\"'
obj.cxxflags += ' -DMODULE_DIR=\\\"' + os.path.normpath(bld.env['LIBDIRNAME']) + '\\\"'
obj.cxxflags += ' -DLOCALEDIR=\\\"' + os.path.join(
os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '\\\"'
obj.cxxflags = ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"']
obj.cxxflags += ['-DPACKAGE="gtk2_ardour"']
obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIRNAME']) + '"']
obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '"']
obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIRNAME']) + '"']
obj.cxxflags += ['-DLOCALEDIR="' + os.path.join(
os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
# Wrappers

16
libs/ardour/wscript
View File

@ -218,14 +218,14 @@ def build(bld):
obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libvampplugin libtaglib'
obj.vnum = LIBARDOUR_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.cxxflags = ' -DPACKAGE=\\\"libardour3\\\"'
obj.cxxflags += ' -DDATA_DIR=\\\"' + os.path.normpath(bld.env['DATADIR']) + '\\\"'
obj.cxxflags += ' -DCONFIG_DIR=\\\"' + os.path.normpath(bld.env['CONFIGDIR']) + '\\\"'
obj.cxxflags += ' -DMODULE_DIR=\\\"' + os.path.normpath(bld.env['LIBDIR']) + '\\\"'
obj.cxxflags += ' -DLOCALEDIR=\\\"' + os.path.join(
os.path.normpath(bld.env['DATADIR']), 'locale') + '\\\"'
obj.cxxflags += ' -DVAMP_DIR=\\\"' + os.path.join(
os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '\\\"'
obj.cxxflags = ['-DPACKAGE="libardour3"']
obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
obj.cxxflags += ['-DLOCALEDIR="' + os.path.join(
os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
obj.cxxflags += ['-DVAMP_DIR="' + os.path.join(
os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
obj.source += ' rb_effect.cc '
obj.uselib_local += ' librubberband '
#obj.source += ' st_stretch.cc st_pitch.cc '

2
libs/evoral/wscript
View File

@ -53,7 +53,7 @@ def build(bld):
src/libsmf/smf_tempo.c
'''
libsmf.export_incdirs = ['./src/libsmf']
libsmf.defines = 'SMF_VERSION=\\\"1.2\\\"'
libsmf.defines = 'SMF_VERSION="1.2"'
libsmf.includes = ['./src']
libsmf.name = 'libsmf'
libsmf.target = 'smf'

7
libs/gtkmm2ext/wscript
View File

@ -70,9 +70,10 @@ def build(bld):
obj.uselib_local = 'libpbd'
obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.cxxflags = '-DPACKAGE=\\\"libgtkmm2ext\\\"'
obj.cxxflags += ' -DLOCALEDIR=\\\"' + os.path.join(
os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '\\\"'
obj.cxxflags = [
'-DPACKAGE="libgtkmm2ext"',
'-DLOCALEDIR="' + os.path.join(
os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
def shutdown():
autowaf.shutdown()

2
libs/pbd/gettext.h
View File

@ -20,7 +20,7 @@
#define _LIBGETTEXT_H 1
/* NLS can be disabled through the configure --disable-nls option. */
#if ENABLE_NLS
#ifdef ENABLE_NLS
/* Get declarations of GNU message catalog functions. */
# include <libintl.h>

2
libs/pbd/mountpoint.cc
View File

@ -32,7 +32,7 @@ using std::string;
#include "wafconfig.h"
#endif
#if HAVE_GETMNTENT
#ifdef HAVE_GETMNTENT
#include <mntent.h>
struct mntent_sorter {

4
libs/pbd/wscript
View File

@ -91,9 +91,9 @@ def build(bld):
obj.uselib = 'GLIBMM SIGCPP XML UUID'
obj.vnum = LIBPBD_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.cxxflags = '-DPACKAGE=\\\"libpbd\\\"'
obj.cxxflags = ['-DPACKAGE="libpbd"']
if bld.env['PBD_HAVE_EXECINFO']:
obj.cxxflags += ' -DHAVE_EXECINFO '
obj.cxxflags += ['-DHAVE_EXECINFO']
def shutdown():
autowaf.shutdown()

2
libs/rubberband/wscript
View File

@ -58,7 +58,7 @@ def build(bld):
obj.uselib_local = 'libvamphost'
obj.vnum = LIBRUBBERBAND_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.cxxflags = '-DPACKAGE=\\\"librubberband\\\"'
obj.cxxflags = '-DPACKAGE="librubberband"'
def shutdown():
autowaf.shutdown()

2
libs/surfaces/control_protocol/wscript
View File

@ -26,7 +26,7 @@ def build(bld):
smpte.cc
'''
obj.export_incdirs = ['.']
obj.cxxflags = '-DPACKAGE=\\\"ardour_cp\\\"'
obj.cxxflags = '-DPACKAGE="ardour_cp"'
obj.includes = ['.']
obj.name = 'libsurfaces'
obj.target = 'surfaces'

2
libs/surfaces/frontier/wscript
View File

@ -34,7 +34,7 @@ def build(bld):
midicontrollable.cc
'''
obj.export_incdirs = ['./generic_midi']
obj.cxxflags = '-DPACKAGE=\\\"ardour_genericmidi\\\"'
obj.cxxflags = '-DPACKAGE="ardour_genericmidi"'
obj.includes = ['.', './generic_midi']
obj.name = 'libgeneric_midi'
obj.target = 'generic_midi'

2
libs/surfaces/generic_midi/wscript
View File

@ -26,7 +26,7 @@ def build(bld):
midicontrollable.cc
'''
obj.export_incdirs = ['./generic_midi']
obj.cxxflags = '-DPACKAGE=\\\"ardour_genericmidi\\\"'
obj.cxxflags = '-DPACKAGE="ardour_genericmidi"'
obj.includes = ['.', './generic_midi']
obj.name = 'libgeneric_midi'
obj.target = 'generic_midi'

2
libs/surfaces/mackie/wscript
View File

@ -41,7 +41,7 @@ def build(bld):
types.cc
'''
obj.export_incdirs = ['./mackie']
obj.cxxflags = '-DPACKAGE=\\\"ardour_mackie\\\"'
obj.cxxflags = '-DPACKAGE="ardour_mackie"'
obj.includes = ['.', './mackie']
obj.name = 'libmackie'
obj.target = 'mackie'

2
libs/surfaces/osc/wscript
View File

@ -33,7 +33,7 @@ def build(bld):
interface.cc
'''
obj.export_incdirs = ['./osc']
obj.cxxflags = '-DPACKAGE=\\\"ardour_cp\\\"'
obj.cxxflags = '-DPACKAGE="ardour_cp"'
obj.includes = ['.', './osc']
obj.name = 'libsurfaces'
obj.target = 'surfaces'

2
libs/surfaces/powermate/wscript
View File

@ -25,7 +25,7 @@ def build(bld):
powermate.cc
'''
obj.export_incdirs = ['./powermate']
obj.cxxflags = '-DPACKAGE=\\\"ardour_powermate\\\"'
obj.cxxflags = '-DPACKAGE="ardour_powermate"'
obj.includes = ['.', './powermate']
obj.name = 'libpowermate'
obj.target = 'powermate'

2
libs/surfaces/tranzport/wscript
View File

@ -39,7 +39,7 @@ def build(bld):
wheel_modes.cc
'''
obj.export_incdirs = ['./tranzport']
obj.cxxflags = '-DPACKAGE=\\\"ardour_tranzport\\\"'
obj.cxxflags = '-DPACKAGE="ardour_tranzport"'
obj.includes = ['.', './tranzport']
obj.name = 'libtranzport'
obj.target = 'tranzport'

2
libs/surfaces/wiimote/wscript
View File

@ -25,7 +25,7 @@ def build(bld):
interface.cc
'''
obj.export_incdirs = ['./wiimote']
obj.cxxflags = '-DPACKAGE=\\\"ardour_wiimote\\\"'
obj.cxxflags = '-DPACKAGE="ardour_wiimote"'
obj.includes = ['.', './wiimote']
obj.name = 'libwiimote'
obj.target = 'wiimote'

BIN
waf vendored
View File

Binary file not shown.