Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for mac builds

Browse Source 
Change-Id: I66dafd5e6d5ff10e7fb98cf718bb6f9343d03184
This commit is contained in:
Fredric Silberberg
2015-10-31 18:46:49 -04:00
parent 9df5f5e27a
commit b793810e4a
5 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java.gradle
View File

@@ -96,14 +96,17 @@ ext.setupJniIncludes = { binaries ->
def jdkLocation = org.gradle.internal.jvm.Jvm.current().javaHome
platformSpecificIncludeFlag("${jdkLocation}/include", cppCompiler)
if (targetPlatform.operatingSystem.macOsX) {
platformSpecificIncludeFlag("${jdkLocation}/include/darwin", cppCompiler)
} else if (targetPlatform.operatingSystem.linux) {
if (targetPlatform.operatingSystem.linux) {
platformSpecificIncludeFlag("${jdkLocation}/include/linux", cppCompiler)
} else if (targetPlatform.operatingSystem.windows) {
platformSpecificIncludeFlag("${jdkLocation}/include/win32", cppCompiler)
} else if (targetPlatform.operatingSystem.freeBSD) {
platformSpecificIncludeFlag("${jdkLocation}/include/freebsd", cppCompiler)
} else if (file("$jdkLocation/include/darwin").exists()) {
// TODO: As of Gradle 2.8, targetPlatform.operatingSystem.macOsX returns false
// on El Capitan. We therefore manually test for the darwin folder and include it
// if it exists
platformSpecificIncludeFlag("${jdkLocation}/include/darwin", cppCompiler)
}
}