From 23204fcc73bc01dc05e2a109551d2c7d57403a88 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Wed, 8 Nov 2023 22:04:28 +0300 Subject: [PATCH] wscipt: fix cant find env cache togl --- .github/workflows/build.yml | 2 +- wscript | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b04ecdb..3c11a8e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: - name: Build dedicated windows-amd64 run: | git submodule init && git submodule update - ./waf.bat configure -T debug -d -8 + ./waf.bat configure -T debug -d ./waf.bat build build-dedicated-linux-i386: diff --git a/wscript b/wscript index 9df617a6..54118415 100644 --- a/wscript +++ b/wscript @@ -451,6 +451,13 @@ def configure(conf): elif conf.env.DEST_OS == 'darwin': conf.load('mm_hook') + conf.env.BIT32_MANDATORY = conf.options.TARGET32 + if conf.env.BIT32_MANDATORY: + Logs.info('WARNING: will build engine for 32-bit target') + conf.load('force_32bit') + + define_platform(conf) + if conf.env.TOGLES: projects['game'] += ['togles'] elif conf.env.GL: @@ -462,13 +469,6 @@ def configure(conf): if conf.options.OPUS or conf.env.DEST_OS == 'android': projects['game'] += ['engine/voice_codecs/opus'] - conf.env.BIT32_MANDATORY = conf.options.TARGET32 - if conf.env.BIT32_MANDATORY: - Logs.info('WARNING: will build engine for 32-bit target') - conf.load('force_32bit') - - define_platform(conf) - if conf.options.DISABLE_WARNS: compiler_optional_flags = ['-w'] else: