Lower glib/glibmm dependency to 2.14.

Fix optional parameters all over the palce because waf is retarded and sets failed check variables to ##some#stupid#name#like#this instead of false.
Portability fixes (Ingen (except GUI) and all dependencies builds on OSX).


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

1 files changed, 17 insertions, 15 deletions

diff --git a/src/engine/wscript b/src/engine/wscript
index a6871717..6d62a976 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -17,9 +17,6 @@ def build(bld):
 		GraphObjectImpl.cpp
 		InputPort.cpp
 		InternalPlugin.cpp
-		LADSPAPlugin.cpp
-		LV2Info.cpp
-		LV2Plugin.cpp
 		MessageContext.cpp
 		MidiControlNode.cpp
 		MidiNoteNode.cpp
@@ -42,18 +39,19 @@ def build(bld):
 
 	obj = bld.create_obj('cpp', 'shlib')
 	obj.source = core_source
-	if bld.env()['HAVE_LADSPA']:
-		obj.source += ' LADSPANode.cpp '
-	if bld.env()['HAVE_SLV2']:
-		obj.source += ' LV2Node.cpp '
+	if bld.env()['HAVE_LADSPA'] == 1:
+		obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp '
+	if bld.env()['HAVE_SLV2'] == 1:
+		obj.source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
 	obj.includes     = ['.', '..', '../common', './events']
 	obj.name         = 'libingen_engine'
 	obj.target       = 'ingen_engine'
 	obj.inst_dir     = 'lib/ingen'
+	obj.uselib_local = 'libingen_shared'
 	core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM'
 	autowaf.use_lib(bld, obj, core_libs)
 	
-	if bld.env()['HAVE_SOUP'] or bld.env()['HAVE_LIBLO']:
+	if bld.env()['HAVE_SOUP'] == 1 or bld.env()['HAVE_LIBLO'] == 1:
 		obj = bld.create_obj('cpp', 'shlib')
 		obj.source = '''
 			events/SetPortValueEvent.cpp
@@ -92,45 +90,49 @@ def build(bld):
 		obj.inst_dir     = 'lib/ingen'
 		autowaf.use_lib(bld, obj, core_libs)
 	
-	if bld.env()['HAVE_SOUP']:
+	if bld.env()['HAVE_SOUP'] == 1:
 		obj = bld.create_obj('cpp', 'shlib')
 		obj.source = 'QueuedEventSource.cpp QueuedEngineInterface.cpp HTTPEngineReceiver.cpp'
 		obj.includes     = ['.', '..', '../common', './events', '../engine']
 		obj.name         = 'libingen_engine_http'
 		obj.target       = 'ingen_engine_http'
 		obj.inst_dir     = 'lib/ingen'
+		obj.uselib_local = 'libingen_engine'
 		autowaf.use_lib(bld, obj, core_libs + ' SOUP')
 	
-	if bld.env()['HAVE_LIBLO']:
+	if bld.env()['HAVE_LIBLO'] == 1:
 		obj = bld.create_obj('cpp', 'shlib')
 		obj.source = 'QueuedEventSource.cpp QueuedEngineInterface.cpp OSCClientSender.cpp OSCEngineReceiver.cpp'
 		obj.includes     = ['.', '..', '../common', './events', '../engine']
 		obj.name         = 'libingen_engine_osc'
 		obj.target       = 'ingen_engine_osc'
 		obj.inst_dir     = 'lib/ingen'
+		obj.uselib_local = 'libingen_engine'
 		autowaf.use_lib(bld, obj, core_libs + ' LIBLO')
 	
-	if bld.env()['HAVE_JACK']:
+	if bld.env()['HAVE_JACK'] == 1:
 		obj = bld.create_obj('cpp', 'shlib')
 		obj.source = 'JackAudioDriver.cpp JackMidiDriver.cpp'
 		obj.includes     = ['.', '..', '../common', './events', '../engine']
 		obj.name         = 'libingen_engine_jack'
 		obj.target       = 'ingen_engine_jack'
 		obj.inst_dir     = 'lib/ingen'
+		obj.uselib_local = 'libingen_engine'
 		autowaf.use_lib(bld, obj, core_libs + ' JACK')
 
 	# Lightweight ingen/lv2 wrapper
 	obj = bld.create_obj('cpp', 'shlib')
 	obj.source = core_source
-	if bld.env()['HAVE_LADSPA']:
-		obj.source += ' LADSPANode.cpp '
-	if bld.env()['HAVE_SLV2']:
-		obj.source += ' LV2Node.cpp '
+	if bld.env()['HAVE_LADSPA'] == 1:
+		obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp '
+	if bld.env()['HAVE_SLV2'] == 1:
+		obj.source += ' LV2Plugin.cpp LV2Node.cpp '
 	obj.includes     = ['.', '..', '../common', './events']
 	obj.name         = 'ingen_lv2'
 	obj.target       = 'ingen.lv2/ingen_lv2'
 	#obj.inst_dir     = 'lib/lv2/ingen.lv2'
 	obj.inst_var     = 0
+	obj.uselib_local = 'libingen_engine'
 	core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM'
 	autowaf.use_lib(bld, obj, core_libs)