diff --git a/CMakeLists.txt b/CMakeLists.txt index ad5c709c..ee8a8ee0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,7 @@ elseif(UNIX) -msse -msse2 -msse3 -mmmx -m3dnow \ -Wformat -Wno-overloaded-virtual -Wno-missing-braces -Wno-format \ -Wno-write-strings -Wno-unknown-pragmas \ - -Wno-uninitialized -Wno-reorder -Wno-autological-constant-out-of-range-compare") + -Wno-uninitialized -Wno-reorder -Wno-tautological-constant-out-of-range-compare") add_definitions(-DLINUX -D_REENTRANT -Dlinux -D_USING_STL -D_GNU_SOURCE -D_XOPEN_SOURCE=500 -U_FORTIFY_SOURCE) endif() diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index 75f83e68..a4d53d43 100755 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp @@ -1149,6 +1149,8 @@ void JavaLibrary::initializeJavaThread() JNIEnv * env = nullptr; jint result = (*JNI_CreateJavaVMProc)(&ms_jvm, reinterpret_cast(&env), &vm_args); + Os::sleep(500); + if (result != 0) { FATAL(true, ("Failed to CreateJavaVMProc: %d", result));