you're running too damn fast!

swg-duality/src

Fork 0

Browse Source

This commit is contained in:

DarthArgus

2016-12-21 07:59:16 +00:00

parent a4f00c6f22

commit 125b27065c

2 changed files with 3 additions and 1 deletions

									
										CMakeLists.txt
									
		+1
		-1
	
												View File
												
				@@ -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()

									
										engine/server/library/serverScript/src/shared/JavaLibrary.cpp
									
		+2
		
												View File
												
				@@ -1149,6 +1149,8 @@ void JavaLibrary::initializeJavaThread()

					JNIEnv * env = nullptr;

					jint result = (*JNI_CreateJavaVMProc)(&ms_jvm, reinterpret_cast<void**>(&env), &vm_args);

					Os::sleep(500);

					if (result != 0)

					{

						FATAL(true, ("Failed to CreateJavaVMProc: %d", result));