Skip to content

Commit 7a3b3cd

Browse files
committed
return accidentally commented out engine module( fixes #315 )
1 parent 90e2937 commit 7a3b3cd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

wscript

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ projects={
5151
'datacache',
5252
'datamodel',
5353
'dmxloader',
54-
# 'engine',
54+
'engine',
5555
'engine/voice_codecs/minimp3',
5656
'filesystem',
5757
'game/client',
@@ -433,7 +433,7 @@ def check_deps(conf):
433433
# conf.multicheck(*a, run_all_tests = True, mandatory = True)
434434

435435
def configure(conf):
436-
conf.load('fwgslib reconfigure compiler_c compiler_cxx compiler_optimizations gccdeps msvcdeps')
436+
conf.load('fwgslib reconfigure compiler_optimizations')
437437

438438
# Force XP compability, all build targets should add
439439
# subsystem=bld.env.MSVC_SUBSYSTEM
@@ -444,8 +444,8 @@ def configure(conf):
444444
conf.env.MSVC_TARGETS = ['x86']
445445

446446
if sys.platform == 'win32':
447-
conf.load('msvc_pdb_ext msdev msvs')
448-
conf.load('subproject xcompile compiler_c compiler_cxx gitversion clang_compilation_database strip_on_install_v2 waf_unit_test enforce_pic')
447+
conf.load('msvc_pdb_ext msdev msvs msvcdeps')
448+
conf.load('subproject xcompile compiler_c compiler_cxx gccdeps gitversion clang_compilation_database strip_on_install_v2 waf_unit_test enforce_pic')
449449
if conf.env.DEST_OS == 'win32' and conf.env.DEST_CPU == 'amd64':
450450
conf.load('masm')
451451
elif conf.env.DEST_OS == 'darwin':
@@ -495,7 +495,7 @@ def configure(conf):
495495
cflags, linkflags = conf.get_optimization_flags()
496496

497497

498-
flags = [] #'-M -MT']
498+
flags = []
499499

500500
if conf.options.SANITIZE:
501501
flags += ['-fsanitize=%s'%conf.options.SANITIZE, '-fno-sanitize=vptr']

0 commit comments

Comments
 (0)