projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove inclusion of ardour_ui.h from ui_config.cc
[ardour.git]
/
libs
/
fst
/
wscript
diff --git
a/libs/fst/wscript
b/libs/fst/wscript
index d7223fb30b10ef4660cfb00c7762109744950128..76e0b934e322ee896f0ff727d37ef2f65baf18c9 100644
(file)
--- a/
libs/fst/wscript
+++ b/
libs/fst/wscript
@@
-18,7
+18,7
@@
scanner_app_src = [
]
# needed for code used from libardour
]
# needed for code used from libardour
-I18N_PACKAGE = 'ardour
3
'
+I18N_PACKAGE = 'ardour'
def options(opt):
autowaf.set_options(opt)
def options(opt):
autowaf.set_options(opt)
@@
-47,11
+47,11
@@
def build(bld):
if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
# wine exec wrapper script
if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
# wine exec wrapper script
- obj = bld(features = 'subst'
, rule= 'chmod 0755 ${TGT}'
)
+ obj = bld(features = 'subst')
obj.source = 'scanner.wine'
obj.target = 'ardour-vst-scanner'
obj.chmod = Utils.O755
obj.source = 'scanner.wine'
obj.target = 'ardour-vst-scanner'
obj.chmod = Utils.O755
- obj.install_path = os.path.join(bld.env['LIBDIR']
, 'ardour3/fst'
)
+ obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.dict = {
'VERSION' : bld.env['VERSION'],
}
obj.dict = {
'VERSION' : bld.env['VERSION'],
}
@@
-59,27
+59,32
@@
def build(bld):
obj = bld (features = 'c cxx cxxprogram wine')
obj.source = (
'scanner.cc',
obj = bld (features = 'c cxx cxxprogram wine')
obj.source = (
'scanner.cc',
- 'fst.c',
'vstwin.c',
)
obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
'vstwin.c',
)
obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
+ obj.linkflags += bld.env['LDFLAGS']
obj.target = 'ardour-vst-scanner.exe.so'
obj.uselib = ['GIOMM', 'DL']
obj.target = 'ardour-vst-scanner.exe.so'
obj.uselib = ['GIOMM', 'DL']
+ obj.use = [ 'libpbd' ]
else:
obj = bld (features = 'cxx c cxxprogram')
else:
obj = bld (features = 'cxx c cxxprogram')
+ obj.source = ( 'scanner.cc' )
+ obj.target = 'ardour-vst-scanner'
if bld.is_defined('WINDOWS_VST_SUPPORT'):
if bld.is_defined('WINDOWS_VST_SUPPORT'):
-
obj.source = ( 'scanner.cc', 'fst.c', 'vstwin.c'
)
+
bld (features = 'c', name='vstwin', source='vstwin.c', uselib = 'GIOMM', includes = [ '../pbd/', '../ardour/', '.' ]
)
obj.uselib = ['GIOMM', 'DL', 'GDI32']
obj.uselib = ['GIOMM', 'DL', 'GDI32']
+ obj.linkflags = ['-mwindows']
+ obj.use = [ 'libpbd', 'vstwin' ]
else:
else:
- obj.source = ( 'scanner.cc' )
obj.uselib = ['GIOMM', 'DL']
obj.uselib = ['GIOMM', 'DL']
- obj.target = 'ardour-vst-scanner'
+ obj.use = [ 'libpbd' ]
obj.includes = [ '../pbd/', '../ardour/', '.' ]
obj.defines = [
'_POSIX_SOURCE',
'USE_WS_PREFIX',
'VST_SCANNER_APP',
obj.includes = [ '../pbd/', '../ardour/', '.' ]
obj.defines = [
'_POSIX_SOURCE',
'USE_WS_PREFIX',
'VST_SCANNER_APP',
- 'PACKAGE="' + I18N_PACKAGE + '"',
+ 'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"',
+ 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
]
]
- obj.install_path = os.path.join(bld.env['LIBDIR']
, 'ardour3/fst'
)
+ obj.install_path = os.path.join(bld.env['LIBDIR'])