diff options
| author | David Robillard <d@drobilla.net> | 2021-01-01 19:01:15 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2021-01-01 21:14:20 +0100 |
| commit | ed3bb5313f46b5d7b22b16f8de45536fdc86f1e3 (patch) | |
| tree | 398bb7d01c4493dd7e41ddb2b6c60a62282ec58a | |
| parent | 375a8eb7c218d807dc601ae4af231131e3ef81ff (diff) | |
| download | suil-ed3bb5313f46b5d7b22b16f8de45536fdc86f1e3.tar.gz suil-ed3bb5313f46b5d7b22b16f8de45536fdc86f1e3.tar.bz2 suil-ed3bb5313f46b5d7b22b16f8de45536fdc86f1e3.zip | |
Reduce compile-time configuration
This is not necessary since the appropriate module is always the same and is
searched for at runtime. If it failes to load, an error message with the
missing module's name in it will be logged, which is more informative than the
previous situation.
| -rw-r--r-- | src/instance.c | 39 | ||||
| -rw-r--r-- | wscript | 1 |
2 files changed, 15 insertions, 25 deletions
diff --git a/src/instance.c b/src/instance.c index 0aa96c9..2511c64 100644 --- a/src/instance.c +++ b/src/instance.c @@ -88,78 +88,69 @@ open_wrapper(SuilHost* host, unsigned n_features) { 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"; } -#endif -#ifdef SUIL_WITH_GTK2_IN_QT5 + + if (!strcmp(container_type_uri, QT5_UI_URI) && !strcmp(ui_type_uri, GTK2_UI_URI)) { module_name = "suil_gtk2_in_qt5"; } -#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"; } -#endif -#ifdef SUIL_WITH_QT5_IN_GTK2 + + if (!strcmp(container_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, QT5_UI_URI)) { module_name = "suil_qt5_in_gtk2"; } -#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"; } -#endif -#ifdef SUIL_WITH_X11_IN_GTK3 + if (!strcmp(container_type_uri, GTK3_UI_URI) && !strcmp(ui_type_uri, X11_UI_URI)) { module_name = "suil_x11_in_gtk3"; } -#endif -#ifdef SUIL_WITH_QT5_IN_GTK3 + if (!strcmp(container_type_uri, GTK3_UI_URI) && !strcmp(ui_type_uri, QT5_UI_URI)) { module_name = "suil_qt5_in_gtk3"; } -#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"; } -#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"; } -#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 -#ifdef SUIL_WITH_X11_IN_QT5 + if (!strcmp(container_type_uri, QT5_UI_URI) && !strcmp(ui_type_uri, X11_UI_URI)) { module_name = "suil_x11_in_qt5"; } -#endif -#ifdef SUIL_WITH_COCOA_IN_QT5 + if (!strcmp(container_type_uri, QT5_UI_URI) && !strcmp(ui_type_uri, COCOA_UI_URI)) { module_name = "suil_cocoa_in_qt5"; } -#endif if (!module_name) { SUIL_ERRORF("Unable to wrap UI type <%s> as type <%s>\n", @@ -109,7 +109,6 @@ def configure(conf): conf.check_pkg('x11', uselib_store='X11', system=True, mandatory=False) def enable_module(var_name): - conf.define(var_name, 1) conf.env[var_name] = 1 if not conf.options.no_gtk: |