From 869b6845362943f51367df4b4cf898fc72537029 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 18 Oct 2019 06:35:05 +0300 Subject: [PATCH] wscript: remove multicheck for win32 libs, remove sdl2 checking from main wscript --- wscript | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/wscript b/wscript index 54a85977..1d56ba6c 100644 --- a/wscript +++ b/wscript @@ -120,8 +120,6 @@ def configure(conf): else: conf.env.BIT32_MANDATORY = False conf.load('force_32bit') - if conf.env.DEST_OS != 'android' and not conf.options.DEDICATED: - conf.load('sdl2') linker_flags = { 'common': { @@ -250,11 +248,11 @@ def configure(conf): # Usually, they are always available # but we need them in uselib a = map(lambda x: { - 'features': 'c', - 'message': '...' + x, + # 'features': 'c', + # 'message': '...' + x, 'lib': x, - 'uselib_store': x.upper(), - 'global_define': False, + # 'uselib_store': x.upper(), + # 'global_define': False, }, [ 'user32', 'shell32', @@ -265,7 +263,10 @@ def configure(conf): 'ws2_32' ]) - conf.multicheck(*a, run_all_tests = True, mandatory = True) + for i in a: + conf.check_cc(**i) + + # conf.multicheck(*a, run_all_tests = True, mandatory = True) # indicate if we are packaging for Linux/BSD if(not conf.options.WIN_INSTALL and