From 55c4d2a72be3599312040ef1c9a17636afdc3558 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 1 Jan 2021 19:04:35 +0100 Subject: Remove the need for a generated configuration header Since some of these values were not actually configurable anyway, the redundant code in the wscript has been removed since the values are equivalent to the fallbacks defined in C. --- wscript | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 59a0302..538c566 100644 --- a/wscript +++ b/wscript @@ -180,7 +180,6 @@ def configure(conf): conf.define('SUIL_MODULE_DIR', conf.env.LIBDIR + '/suil-' + SUIL_MAJOR_VERSION) - conf.define('SUIL_DIR_SEP', '/') conf.define('SUIL_GTK2_LIB_NAME', conf.options.gtk2_lib_name) conf.define('SUIL_GTK3_LIB_NAME', conf.options.gtk3_lib_name) @@ -217,29 +216,13 @@ def configure(conf): if conf.env.HAVE_X11: enable_module('SUIL_WITH_X11') - module_prefix = '' - module_ext = '' - if conf.env.PARDEBUG: - module_ext += 'D' - if conf.env.DEST_OS == 'win32': - module_ext += '.dll' - elif conf.env.DEST_OS == 'darwin': - module_prefix = 'lib' - module_ext += '.dylib' - else: - module_prefix = 'lib' - module_ext += '.so' - - conf.define('SUIL_MODULE_PREFIX', module_prefix) - conf.define('SUIL_MODULE_EXT', module_ext) - conf.run_env.append_unique('SUIL_MODULE_DIR', [conf.build_path()]) # Set up environment for building/using as a subproject autowaf.set_lib_env(conf, 'suil', SUIL_VERSION, include_path=str(conf.path.find_node('include'))) - conf.write_config_header('suil_config.h', remove=False) + conf.define('SUIL_NO_DEFAULT_CONFIG', 1) autowaf.display_summary( conf, -- cgit v1.2.1