Skip to content

Commit 23204fc

Browse files
committed
wscipt: fix cant find env cache togl
1 parent abb470a commit 23204fc

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Build dedicated windows-amd64
7272
run: |
7373
git submodule init && git submodule update
74-
./waf.bat configure -T debug -d -8
74+
./waf.bat configure -T debug -d
7575
./waf.bat build
7676
7777
build-dedicated-linux-i386:

wscript

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,13 @@ def configure(conf):
451451
elif conf.env.DEST_OS == 'darwin':
452452
conf.load('mm_hook')
453453

454+
conf.env.BIT32_MANDATORY = conf.options.TARGET32
455+
if conf.env.BIT32_MANDATORY:
456+
Logs.info('WARNING: will build engine for 32-bit target')
457+
conf.load('force_32bit')
458+
459+
define_platform(conf)
460+
454461
if conf.env.TOGLES:
455462
projects['game'] += ['togles']
456463
elif conf.env.GL:
@@ -462,13 +469,6 @@ def configure(conf):
462469
if conf.options.OPUS or conf.env.DEST_OS == 'android':
463470
projects['game'] += ['engine/voice_codecs/opus']
464471

465-
conf.env.BIT32_MANDATORY = conf.options.TARGET32
466-
if conf.env.BIT32_MANDATORY:
467-
Logs.info('WARNING: will build engine for 32-bit target')
468-
conf.load('force_32bit')
469-
470-
define_platform(conf)
471-
472472
if conf.options.DISABLE_WARNS:
473473
compiler_optional_flags = ['-w']
474474
else:

0 commit comments

Comments
 (0)