From 67e77ca09983b7c0e615ff12cd0ec0707746df43 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 24 Nov 2021 23:54:03 +0300 Subject: [PATCH] wscript: move setting DOS options where they should be --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 14f63052..0c06e8c3 100644 --- a/wscript +++ b/wscript @@ -157,6 +157,8 @@ def configure(conf): conf.options.NO_ASYNC_RESOLVE = True conf.define('XASH_SDLMAIN', 1) enforce_pic = False + elif conf.env.DEST_OS == 'dos': + conf.options.SINGLE_BINARY = True if conf.env.STATIC_LINKING: enforce_pic = False # PIC may break full static builds @@ -246,8 +248,6 @@ def configure(conf): conf.env.ENABLE_UTILS = conf.options.ENABLE_UTILS conf.env.DEDICATED = conf.options.DEDICATED conf.env.SINGLE_BINARY = conf.options.SINGLE_BINARY or conf.env.DEDICATED - if conf.env.DEST_OS == 'dos': - conf.env.SINGLE_BINARY = True if conf.env.DEST_OS != 'win32': conf.check_cc(lib='dl', mandatory=False)