wscipt: fix cant find env cache togl

This commit is contained in:
nillerusr 2023-11-08 22:04:28 +03:00
parent abb470a471
commit 23204fcc73
2 changed files with 8 additions and 8 deletions

View File

@ -71,7 +71,7 @@ jobs:
- name: Build dedicated windows-amd64 - name: Build dedicated windows-amd64
run: | run: |
git submodule init && git submodule update git submodule init && git submodule update
./waf.bat configure -T debug -d -8 ./waf.bat configure -T debug -d
./waf.bat build ./waf.bat build
build-dedicated-linux-i386: build-dedicated-linux-i386:

14
wscript
View File

@ -451,6 +451,13 @@ def configure(conf):
elif conf.env.DEST_OS == 'darwin': elif conf.env.DEST_OS == 'darwin':
conf.load('mm_hook') 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: if conf.env.TOGLES:
projects['game'] += ['togles'] projects['game'] += ['togles']
elif conf.env.GL: elif conf.env.GL:
@ -462,13 +469,6 @@ def configure(conf):
if conf.options.OPUS or conf.env.DEST_OS == 'android': if conf.options.OPUS or conf.env.DEST_OS == 'android':
projects['game'] += ['engine/voice_codecs/opus'] 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: if conf.options.DISABLE_WARNS:
compiler_optional_flags = ['-w'] compiler_optional_flags = ['-w']
else: else: