From 4d3612e45390c58a16d6fa5ee89183aadc119a03 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 21 Oct 2018 20:09:49 +0000 Subject: [PATCH] Do not modify UserBuildSettings in SConf Creating an attribute on UserBuildSettings during SConf breaks clean/help, which do not run configure tests. Remove that and add a method to return the value the attribute would have had. Reported-by: derhass Fixes: 1be414217cd3dfcb14c993c92f60bdafc0cb23dc ("Add build time flag to choose whether to enable ADL MIDI support") --- SConstruct | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index e4ff94792..09300b452 100644 --- a/SConstruct +++ b/SConstruct @@ -1172,9 +1172,7 @@ struct d_screenshot return context.Result('%s: checking how to handle ADL MIDI...%s' % (self.msgprefix, adlmidi_load_type)) Define = context.sconf.Define - enable_adlmidi = int(adlmidi != 'none') - user_settings._enable_adlmidi = enable_adlmidi - Define('DXX_USE_ADLMIDI', enable_adlmidi) + Define('DXX_USE_ADLMIDI', int(user_settings._enable_adlmidi())) @_custom_test def _check_user_settings_screenshot(self,context): @@ -3458,6 +3456,8 @@ class DXXCommon(LazyObjectConstructor): return self.default_EGL_LIB def need_dynamic_library_load(self): return self.adlmidi == 'runtime' + def _enable_adlmidi(self): + return self.adlmidi != 'none' def __default_DATA_DIR(self): platform_settings_type = self._program.get_platform_settings_type(self.host_platform) @@ -4305,7 +4305,7 @@ class DXXArchive(DXXCommon): value = list(__get_objects_common(self)) extend = value.extend user_settings = self.user_settings - if user_settings._enable_adlmidi: + if user_settings._enable_adlmidi(): extend(__get_objects_use_adlmidi(self)) if not user_settings.sdl2: extend(__get_objects_use_sdl1(self))