Merge remote-tracking branch 'remotes/origin/master' into new_level_refactor

# Conflicts:
#	src/g_level.cpp
#	src/p_user.cpp
This commit is contained in:
Christoph Oelckers 2019-02-05 13:49:07 +01:00
commit 979f1df281
10 changed files with 89 additions and 51 deletions

View file

@ -922,6 +922,7 @@ void FFunctionBuildList::Build()
void FFunctionBuildList::DumpJit()
{
#ifdef HAVE_VM_JIT
FILE *dump = fopen("dumpjit.txt", "w");
if (dump == nullptr)
return;
@ -932,6 +933,7 @@ void FFunctionBuildList::DumpJit()
}
fclose(dump);
#endif // HAVE_VM_JIT
}