sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change flow in STBI build script to ease development

Browse Source 
* stb_image.h and AndroidNativeImageLoader.h are now placed in the source folder so that the IDE can access them
This commit is contained in:
shadowislord 2014-11-08 18:02:22 -05:00
parent 17f130615a
commit ff55522f78
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jme3-android-native/stb_image.gradle
View File

@ -22,10 +22,10 @@ task downloadStbImage(type: MyDownload) {
target = file(stbiFolder + File.separator + stbiDownloadTarget) target = file(stbiFolder + File.separator + stbiDownloadTarget)
} }
// Copy stb_image files to jni directory // Copy stb_image.h to the source directory.
task copyStbiFiles(type: Copy) { task copyStbiFiles(type: Copy) {
def sourceDir = file(stbiFolder) def sourceDir = file(stbiFolder)
def outputDir = file(stbiBuildJniDir) def outputDir = file(stbiJmeAndroidPath)
// println "copyStbiFiles sourceDir: " + sourceDir // println "copyStbiFiles sourceDir: " + sourceDir
// println "copyStbiFiles outputDir: " + outputDir // println "copyStbiFiles outputDir: " + outputDir
@ -42,9 +42,23 @@ copyStbiFiles.dependsOn {
} }
} }
task generateStbiHeaders(type: Exec) {
String destDirPath = stbiJmeAndroidPath
String classes = ""
.concat("com.jme3.texture.plugins.AndroidNativeImageLoader, ")
// println "stb_image classes = " + classes
// println "stb_image destDir = " + destDir
// println "stb_image classpath = " + project.projectClassPath
executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah')
args '-d', destDirPath
args '-classpath', project.projectClassPath
args "com.jme3.texture.plugins.AndroidNativeImageLoader"
}
// Copy jME Android native files to jni directory // Copy jME Android native files to jni directory
task copyStbiJmeFiles(type: Copy, dependsOn:copyStbiFiles) { task copyStbiJmeFiles(type: Copy, dependsOn:[copyStbiFiles, generateStbiHeaders]) {
def sourceDir = file(stbiJmeAndroidPath) def sourceDir = file(stbiJmeAndroidPath)
def outputDir = file(stbiBuildJniDir) def outputDir = file(stbiBuildJniDir)
// println "copyStbiJmeFiles sourceDir: " + sourceDir // println "copyStbiJmeFiles sourceDir: " + sourceDir
@ -54,24 +68,7 @@ task copyStbiJmeFiles(type: Copy, dependsOn:copyStbiFiles) {
into outputDir into outputDir
} }
task generateStbiHeaders(dependsOn: copyStbiJmeFiles) << { task buildStbiNativeLib(type: Exec, dependsOn: copyStbiJmeFiles) {
String destDirPath = stbiBuildJniDir
String classes = ""
.concat("com.jme3.texture.plugins.AndroidNativeImageLoader, ")
// println "stb_image classes = " + classes
// println "stb_image destDir = " + destDir
// println "stb_image classpath = " + project.projectClassPath
exec {
executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah')
args '-d', destDirPath
args '-classpath', project.projectClassPath
args "com.jme3.texture.plugins.AndroidNativeImageLoader"
}
}
task buildStbiNativeLib(type: Exec, dependsOn: generateStbiHeaders) {
// println "stb_image build dir: " + stbiBuildDir // println "stb_image build dir: " + stbiBuildDir
// println "ndkCommandPath: " + rootProject.ndkCommandPath // println "ndkCommandPath: " + rootProject.ndkCommandPath