diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-18 10:03:22 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-18 10:03:22 +0100 |
| commit | b855e5f3220027502a3c88f189d511fe2a5a3c2b (patch) | |
| tree | b106fabe68c471cb95688e151e8466dac3e0ea4c /gtk2_ardour | |
| parent | 75b933eadbe8f90a73a29bb207ff26eebcd4121a (diff) | |
| parent | 5ba369918b07a4c0859f0e94537da7b5a11bb49f (diff) | |
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/wscript | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 011126da64..07ff4f4be3 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -256,7 +256,8 @@ def configure(conf): autowaf.build_version_files( path_prefix + 'version.h', path_prefix + 'version.cc', - 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0) + 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0, + '', '') autowaf.configure(conf) if Options.options.dist_target == 'auto': @@ -394,7 +395,21 @@ def build(bld): obj.source = gtk2_ardour_sources obj.target = 'ardour-' + bld.env['VERSION'] obj.includes = ['.'] - + obj.defines = [] + + # if our internal libraries are built as DLL's, define + # the macros that activate the right stuff in headers + # for export/visibility to work on all platforms. + + if bld.is_defined ('INTERNAL_SHARED_LIBS'): + obj.defines += [ 'LIBPBD_DLL=1', + 'LIBARDOUR_DLL=1', + 'LIBMIDIPP_DLL=1', + 'LIBARDOUR_DLL=1', + 'LIBARDOUR_CP_DLL=1', + 'LIBGTKMM2EXT_DLL=1', + 'LIBEVORAL_DLL=1', + ] # continue with setup of obj, which could be a shared library # or an executable. @@ -416,7 +431,7 @@ def build(bld): if sys.platform == 'darwin': obj.uselib += ' AUDIOUNITS OSX GTKOSX' obj.use += ' libappleutility' - obj.defines = [ + obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', |