swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-29 23:15:56 -04:00
Code Issues Projects Releases Wiki Activity

findjni: detect oracle java 6 ...later/todo, recode the java library cpp to properly use java 7/8/9+

Browse Source
This commit is contained in:
DarthArgus
2015-11-23 22:58:34 -06:00
parent d9249aa9f5
commit 6be3472385
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/linux/FindJNI.cmake
+2
View File
@@ -127,6 +127,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/local/jre-1.7.0/lib/{libarch}
/usr/local/jdk-1.6.0/jre/lib/{libarch}
/usr/local/jre-1.6.0/lib/{libarch}
/usr/lib/jvm/java-6-oracle/jre/lib/{libarch} # This is to add Oracle Java 6 support.
)
set(JAVA_JVM_LIBRARY_DIRECTORIES)
@@ -163,6 +164,7 @@ set(JAVA_AWT_INCLUDE_DIRECTORIES
# OpenBSD specific path for default JVM
/usr/local/jdk-1.7.0/include
/usr/local/jdk-1.6.0/include
/usr/lib/jvm/java-6-oracle/include # This is to add Oracle Java 6 support.
)
foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")