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 | 9761f4b2d3cead1532b6bf2c1146f6db5d642698 (patch) | |
tree | d1137037840f15461e1bc07c8ae3ec370271b91f | |
parent | 8ab0ca086fd3fbe3f386813a94a28791c33a374d (diff) | |
download | patchage-9761f4b2d3cead1532b6bf2c1146f6db5d642698.tar.gz patchage-9761f4b2d3cead1532b6bf2c1146f6db5d642698.tar.bz2 patchage-9761f4b2d3cead1532b6bf2c1146f6db5d642698.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/patchage@5472 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | wscript | 8 |
2 files changed, 6 insertions, 5 deletions
@@ -1,8 +1,9 @@ patchage (1.0.1) unstable; * Support Jack CV and OSC via metadata. + * Configure based on compiler target OS for cross-compilation. - -- David Robillard <d@drobilla.net> Mon, 05 May 2014 16:28:59 +0200 + -- David Robillard <d@drobilla.net> Sat, 04 Oct 2014 23:07:45 -0400 patchage (1.0.0) stable; @@ -60,7 +60,7 @@ def configure(conf): autowaf.check_pkg(conf, 'ganv-1', uselib_store='GANV', atleast_version='1.4.0', mandatory=True) - if Options.platform == 'darwin': + if conf.env.DEST_OS == 'darwin': autowaf.check_pkg(conf, 'gtk-mac-integration', uselib_store='GTK_OSX', atleast_version='1.0.0', mandatory=True) if conf.is_defined('HAVE_GTK_OSX'): @@ -120,14 +120,14 @@ def configure(conf): autowaf.display_msg(conf, "Jack Session Management", conf.is_defined('PATCHAGE_JACK_SESSION')) autowaf.display_msg(conf, "Jack Metadata", conf.is_defined('HAVE_JACK_METADATA')) autowaf.display_msg(conf, "Alsa Sequencer", conf.is_defined('HAVE_ALSA')) - if Options.platform == 'darwin': + if conf.env.DEST_OS == 'darwin': autowaf.display_msg(conf, "Mac Integration", conf.is_defined('HAVE_GTK_OSX')) print('') def build(bld): out_base = '' - if Options.platform == 'darwin': + if bld.env.DEST_OS == 'darwin': out_base = 'Patchage.app/Contents/' # Program @@ -173,7 +173,7 @@ def build(bld): APP_INSTALL_NAME = bld.env.APP_INSTALL_NAME, APP_HUMAN_NAME = bld.env.APP_HUMAN_NAME) - if Options.platform == 'darwin': + if bld.env.DEST_OS == 'darwin': # Property list bld(features = 'subst', source = 'osx/Info.plist.in', |