diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/wscript | 4 | ||||
| -rw-r--r-- | src/gui/wscript | 10 | ||||
| -rw-r--r-- | src/server/wscript | 11 | ||||
| -rw-r--r-- | src/wscript | 2 |
4 files changed, 15 insertions, 12 deletions
diff --git a/src/client/wscript b/src/client/wscript index b28f35fe..805d8c86 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -9,8 +9,8 @@ def build(bld): name = 'libingen_client', target = 'ingen_client', install_path = '${LIBDIR}', - use = 'libingen') - autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV SUIL RAUL SERD SORD SIGCPP') + use = 'libingen', + uselib = 'GLIBMM LV2 LILV SUIL RAUL SERD SORD SIGCPP') obj.source = ''' BlockModel.cpp diff --git a/src/gui/wscript b/src/gui/wscript index 7000363f..c34731ba 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -35,8 +35,8 @@ def build(bld): name = 'libingen_gui', target = 'ingen_gui', install_path = '${LIBDIR}', - use = 'libingen libingen_client') - autowaf.use_lib(bld, obj, ''' + use = 'libingen libingen_client', + uselib = ''' GANV GLADEMM GLIBMM @@ -46,7 +46,9 @@ def build(bld): LV2 RAUL SIGCPP + SERD SORD + SRATOM SOUP SUIL WEBKIT @@ -109,5 +111,5 @@ def build(bld): name = 'ingen_gui_lv2', target = 'ingen_gui_lv2', install_path = '${LV2DIR}/ingen.lv2/', - use = 'libingen libingen_gui') - autowaf.use_lib(bld, obj, 'LV2 SERD SORD LILV RAUL GLIBMM GTKMM') + use = 'libingen libingen_gui', + uselib = 'LV2 SERD SORD SRATOM LILV RAUL GLIBMM GTKMM') diff --git a/src/server/wscript b/src/server/wscript index 2f95148a..f01c6e0b 100644 --- a/src/server/wscript +++ b/src/server/wscript @@ -53,6 +53,8 @@ def build(bld): mix.cpp ''' + core_libs = 'LV2 LILV RAUL SERD SORD SRATOM' + obj = bld(features = 'cxx cxxshlib', source = core_source, export_includes = ['../..'], @@ -61,10 +63,9 @@ def build(bld): target = 'ingen_server', install_path = '${LIBDIR}', use = 'libingen libingen_socket', + uselib = core_libs, cxxflags = bld.env.PTHREAD_CFLAGS + bld.env.INGEN_TEST_CXXFLAGS, linkflags = bld.env.PTHREAD_LINKFLAGS + bld.env.INGEN_TEST_LINKFLAGS) - core_libs = 'LV2 LILV RAUL SERD SORD' - autowaf.use_lib(bld, obj, core_libs) if bld.env.HAVE_JACK: obj = bld(features = 'cxx cxxshlib', @@ -74,9 +75,9 @@ def build(bld): target = 'ingen_jack', install_path = '${LIBDIR}', use = 'libingen_server', + uselib = core_libs + ' JACK', cxxflags = ['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS, linkflags = bld.env.PTHREAD_LINKFLAGS) - autowaf.use_lib(bld, obj, core_libs + ' JACK') if bld.env.HAVE_PORTAUDIO: obj = bld(features = 'cxx cxxshlib', @@ -86,9 +87,9 @@ def build(bld): target = 'ingen_portaudio', install_path = '${LIBDIR}', use = 'libingen_server', + uselib = core_libs + ' PORTAUDIO', cxxflags = ['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS, linkflags = bld.env.PTHREAD_LINKFLAGS) - autowaf.use_lib(bld, obj, core_libs + ' PORTAUDIO') # Ingen LV2 wrapper if bld.env.INGEN_BUILD_LV2: @@ -100,6 +101,6 @@ def build(bld): target = 'ingen_lv2', install_path = '${LV2DIR}/ingen.lv2/', use = 'libingen libingen_server', + uselib = core_libs, cxxflags = ['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS, linkflags = bld.env.PTHREAD_LINKFLAGS) - autowaf.use_lib(bld, obj, core_libs) diff --git a/src/wscript b/src/wscript index dd7779b3..ee4311e1 100644 --- a/src/wscript +++ b/src/wscript @@ -41,7 +41,7 @@ def build(bld): vnum = bld.env.INGEN_VERSION, install_path = '${LIBDIR}', lib = lib, + uselib = 'LV2 LILV RAUL SERD SORD SRATOM', cxxflags = (['-fvisibility=hidden'] + bld.env.PTHREAD_CFLAGS + bld.env.INGEN_TEST_CXXFLAGS), linkflags = bld.env.PTHREAD_LINKFLAGS + bld.env.INGEN_TEST_LINKFLAGS) - autowaf.use_lib(bld, obj, 'LV2 LILV RAUL SERD SORD SRATOM') |