Move UI stuff back into slv2.h (avoid breakage).

Deprecate slv2_ui_instance_get_descriptor and slv2_ui_instance_get_handle.


git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@3020 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 3 insertions, 13 deletions

diff --git a/wscript b/wscript
index ada28d9..b2073d2 100644
--- a/wscript
+++ b/wscript
@@ -92,11 +92,7 @@ def configure(conf):
 					  atleast_version='0.120.0', mandatory=False)
 
 	autowaf.check_header(conf, 'lv2/lv2plug.in/ns/lv2core/lv2.h')
-	autowaf.check_header(conf, 'lv2/lv2plug.in/ns/extensions/ui/ui.h',
-						 'HAVE_UI_H')
-
-	if conf.env['HAVE_UI_H']:
-		autowaf.define(conf, 'SLV2_WITH_UI', 1)
+	autowaf.check_header(conf, 'lv2/lv2plug.in/ns/extensions/ui/ui.h')
 
 	if not Options.options.no_jack_session:
 		if conf.env['HAVE_NEW_JACK'] and conf.env['HAVE_GTHREAD']:
@@ -165,8 +161,6 @@ def configure(conf):
 	                    bool(conf.env['BUILD_TESTS']))
 	autowaf.display_msg(conf, "Dynamic manifest support",
 	                    bool(conf.env['SLV2_DYN_MANIFEST']))
-	autowaf.display_msg(conf, "UI support",
-	                    bool(conf.env['SLV2_WITH_UI']))
 	autowaf.display_msg(conf, "Python bindings",
 	                    bool(conf.env['SLV2_SWIG']))
 	print
@@ -185,6 +179,8 @@ def build(bld):
 		src/pluginclass.c
 		src/plugininstance.c
 		src/plugins.c
+		src/pluginui.c
+		src/pluginuiinstance.c
 		src/port.c
 		src/query.c
 		src/scalepoint.c
@@ -193,12 +189,6 @@ def build(bld):
 		src/world.c
 	'''.split()
 
-	if bld.env['SLV2_WITH_UI']:
-		lib_source += '''
-			src/pluginui.c
-			src/pluginuiinstance.c
-		'''.split()
-
 	# Library
 	obj = bld(features = 'c cshlib')
 	obj.export_includes = ['.']