projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge with master, with minor conflict fixes
[ardour.git]
/
libs
/
surfaces
/
frontier
/
wscript
diff --git
a/libs/surfaces/frontier/wscript
b/libs/surfaces/frontier/wscript
index cd388b8bff8a5b3d45688415fcd4f05938fdf525..4fcbe6fde369b49f2bc4f0ae8f3dfd9629739949 100644
(file)
--- a/
libs/surfaces/frontier/wscript
+++ b/
libs/surfaces/frontier/wscript
@@
-1,5
+1,5
@@
#!/usr/bin/env python
#!/usr/bin/env python
-
import
autowaf
+
from waflib.extras import autowaf as
autowaf
import os
# Version of this package (even if built as a child)
import os
# Version of this package (even if built as a child)
@@
-16,10
+16,10
@@
APPNAME = 'libsurfaces'
VERSION = LIBSURFACES_VERSION
# Mandatory variables
VERSION = LIBSURFACES_VERSION
# Mandatory variables
-
srcdir
= '.'
-
blddir
= 'build'
+
top
= '.'
+
out
= 'build'
-def
set_
options(opt):
+def options(opt):
autowaf.set_options(opt)
def configure(conf):
autowaf.set_options(opt)
def configure(conf):
@@
-27,18
+27,19
@@
def configure(conf):
def build(bld):
# Generic MIDI
def build(bld):
# Generic MIDI
- obj = bld
.new_task_gen('cxx', '
shlib')
+ obj = bld
(features = 'cxx cxx
shlib')
obj.source = '''
generic_midi_control_protocol.cc
interface.cc
midicontrollable.cc
'''
obj.source = '''
generic_midi_control_protocol.cc
interface.cc
midicontrollable.cc
'''
- obj.export_incdirs = ['./generic_midi']
- obj.cxxflags = '-DPACKAGE="ardour_genericmidi"'
+ obj.export_includes = ['./generic_midi']
+ obj.defines = [ 'PACKAGE="ardour_frontier"' ]
+ obj.defines += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
obj.includes = ['.', './generic_midi']
obj.name = 'libgeneric_midi'
obj.target = 'generic_midi'
obj.includes = ['.', './generic_midi']
obj.name = 'libgeneric_midi'
obj.target = 'generic_midi'
- obj.use
lib_local = 'libardour libsurfaces
'
+ obj.use
= 'libardour libardourcp
'
obj.vnum = LIBSURFACES_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
obj.vnum = LIBSURFACES_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')