diff options
| author | David Robillard <d@drobilla.net> | 2014-10-05 03:16:18 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-10-05 03:16:18 +0000 |
| commit | ca61e810890985e461b96e8461b6e1e43a55752f (patch) | |
| tree | 19045d5737518db5e97c27ce8e214ae2020e9175 | |
| parent | badfdbbe7fe1c4b3b8f08a1f708c8bf2f9c95033 (diff) | |
| download | suil-ca61e810890985e461b96e8461b6e1e43a55752f.tar.gz suil-ca61e810890985e461b96e8461b6e1e43a55752f.tar.bz2 suil-ca61e810890985e461b96e8461b6e1e43a55752f.zip | |
Configure based on compiler target OS for cross-compilation.
Only add -dl to pkg-config file for appropriate platforms.
Fix #986.
git-svn-id: http://svn.drobilla.net/lad/trunk/suil@5472 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | wscript | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +suil (0.8.3) unstable; + + * Configure based on compiler target OS for cross-compilation + + -- David Robillard <d@drobilla.net> Sat, 04 Oct 2014 23:08:29 -0400 + suil (0.8.2) stable; * Fix embedding several Qt UIs in Gtk @@ -9,7 +9,7 @@ import waflib.extras.autowaf as autowaf # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes -SUIL_VERSION = '0.8.2' +SUIL_VERSION = '0.8.3' SUIL_MAJOR_VERSION = '0' # Mandatory waf variables @@ -89,7 +89,7 @@ def configure(conf): module_ext = '' if conf.env.PARDEBUG: module_ext += 'D' - if Options.platform == 'win32': + if conf.env.DEST_OS == 'win32': module_ext += '.dll' else: module_prefix = 'lib' @@ -122,7 +122,7 @@ def build(bld): cflags = [] lib = [] modlib = [] - if sys.platform == 'win32': + if bld.env.DEST_OS == 'win32': modlib += ['user32'] else: cflags += ['-fvisibility=hidden'] @@ -195,7 +195,7 @@ def build(bld): linkflags = bld.env.NODELETE_FLAGS) autowaf.use_lib(bld, obj, 'GTK2 GTK2_X11 LV2 LV2_1_4_3') - if bld.is_defined('HAVE_GTK2') and sys.platform == 'win32': + if bld.is_defined('HAVE_GTK2') and bld.env.DEST_OS == 'win32': obj = bld(features = 'cxx cxxshlib', source = 'src/win_in_gtk2.cpp', target = 'suil_win_in_gtk2', |