From e0508b6f55e83ab2846f84775dc0861f1ee1aa9c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 14 May 2015 05:29:50 +0000 Subject: Only report suil_ui_supported() if necessary wrapper is compiled in. Fixes issue #1045. git-svn-id: http://svn.drobilla.net/lad/trunk/suil@5679 a436a847-0d15-0410-975c-d299462d15a1 --- src/instance.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'src/instance.c') diff --git a/src/instance.c b/src/instance.c index 0c27ad7..4ace18c 100644 --- a/src/instance.c +++ b/src/instance.c @@ -70,25 +70,42 @@ open_wrapper(SuilHost* host, } const char* module_name = NULL; +#ifdef SUIL_WITH_GTK2_IN_QT4 if (!strcmp(container_type_uri, QT4_UI_URI) && !strcmp(ui_type_uri, GTK2_UI_URI)) { module_name = "suil_gtk2_in_qt4"; - } else if (!strcmp(container_type_uri, GTK2_UI_URI) + } +#endif +#ifdef SUIL_WITH_QT4_IN_GTK2 + if (!strcmp(container_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, QT4_UI_URI)) { module_name = "suil_qt4_in_gtk2"; - } else if (!strcmp(container_type_uri, GTK2_UI_URI) + } +#endif +#ifdef SUIL_WITH_X11_IN_GTK2 + if (!strcmp(container_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, X11_UI_URI)) { module_name = "suil_x11_in_gtk2"; - } else if (!strcmp(container_type_uri, GTK2_UI_URI) + } +#endif +#ifdef SUIL_WITH_WIN_IN_GTK2 + if (!strcmp(container_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, WIN_UI_URI)) { module_name = "suil_win_in_gtk2"; - } else if (!strcmp(container_type_uri, GTK2_UI_URI) + } +#endif +#ifdef SUIL_WITH_COCOA_IN_GTK2 + if (!strcmp(container_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, COCOA_UI_URI)) { module_name = "suil_cocoa_in_gtk2"; - } else if (!strcmp(container_type_uri, QT4_UI_URI) + } +#endif +#ifdef SUIL_WITH_X11_IN_QT4 + if (!strcmp(container_type_uri, QT4_UI_URI) && !strcmp(ui_type_uri, X11_UI_URI)) { module_name = "suil_x11_in_qt4"; } +#endif if (!module_name) { SUIL_ERRORF("Unable to wrap UI type <%s> as type <%s>\n", -- cgit v1.2.1