swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-14 00:01:30 -04:00
Code Issues Projects Releases Wiki Activity

add optional java 9 support

Browse Source
This commit is contained in:
DarthArgus
2016-02-10 09:36:25 -06:00
parent 66904dc582
commit 090aaeb2ce
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/JavaLibrary.cpp
+10 -2
View File
@@ -1255,11 +1255,19 @@ void JavaLibrary::initializeJavaThread()
tempOption.optionString = const_cast<char *>(classPath.c_str());
options.push_back(tempOption);
#ifdef JNI_VERSION_1_8
vm_args.version = JNI_VERSION_1_8;
// the below is ok but could use the dynamic function call too if we want someday
#ifdef JNI_VERSION_1_9
vm_args.version = JNI_VERSION_1_9;
#define JAVAVERSET = 1
#endif
#ifndef JAVAVERSET
#ifdef JNI_VERSION_1_8
vm_args.version = JNI_VERSION_1_8;
#define JAVAVERSET = 1
#endif
#endif
#ifndef JAVAVERSET
#ifdef JNI_VERSION_1_7
vm_args.version = JNI_VERSION_1_7;