Переглянути джерело

Move OpenALSoft source files to build directory
Move the zip file downloaded from OpenALSoft and the extraction folder to within the build folder so that are ignored by git and cleaned appropriately.

iwgeric 9 роки тому
батько
коміт
adc7ad757e
1 змінених файлів з 6 додано та 6 видалено
  1. 6 6
      jme3-android-native/openalsoft.gradle

+ 6 - 6
jme3-android-native/openalsoft.gradle

@@ -5,7 +5,7 @@ String openALSoftZipFile = 'OpenALSoft.zip'
 // OpenAL Soft directory the download is extracted into
 // OpenAL Soft directory the download is extracted into
 // Typically, the downloaded OpenAL Soft zip file will extract to a directory
 // Typically, the downloaded OpenAL Soft zip file will extract to a directory
 // called "openal-soft"
 // called "openal-soft"
-String openALSoftFolder = 'openal-soft'
+String openALSoftFolder = 'openal-soft-e5016f8'
 
 
 //Working directories for the ndk build.
 //Working directories for the ndk build.
 String openalsoftBuildDir = "${buildDir}" + File.separator + 'openalsoft'
 String openalsoftBuildDir = "${buildDir}" + File.separator + 'openalsoft'
@@ -21,19 +21,19 @@ String openalsoftJmeAndroidPath = 'src/native/jme_openalsoft'
 // Download external source files if not available
 // Download external source files if not available
 task downloadOpenALSoft(type: MyDownload) {
 task downloadOpenALSoft(type: MyDownload) {
     sourceUrl = openALSoftUrl
     sourceUrl = openALSoftUrl
-    target = file(openALSoftZipFile)
+    target = file(openalsoftBuildDir + File.separator + openALSoftZipFile)
 }
 }
 
 
 // Unzip external source files
 // Unzip external source files
 task unzipOpenALSoft(type: Copy) {
 task unzipOpenALSoft(type: Copy) {
-    def zipFile = file(openALSoftZipFile)
-    def outputDir = file(".")
+    def zipFile = file(openalsoftBuildDir + File.separator + openALSoftZipFile)
+    def outputDir = file(openalsoftBuildDir)
 
 
     from zipTree(zipFile)
     from zipTree(zipFile)
     into outputDir
     into outputDir
 }
 }
 unzipOpenALSoft.dependsOn {
 unzipOpenALSoft.dependsOn {
-    def zipFilePath = project.projectDir.absolutePath + File.separator + openALSoftZipFile
+    def zipFilePath = openalsoftBuildDir + File.separator + openALSoftZipFile
     def zipFile = new File(zipFilePath)
     def zipFile = new File(zipFilePath)
 //    println "zipFile path: " + zipFile.absolutePath
 //    println "zipFile path: " + zipFile.absolutePath
 //    println "zipFile exists: " + zipFile.exists()
 //    println "zipFile exists: " + zipFile.exists()
@@ -44,7 +44,7 @@ unzipOpenALSoft.dependsOn {
 
 
 // Copy external source files to jni directory
 // Copy external source files to jni directory
 task copyOpenALSoft(type: Copy) {
 task copyOpenALSoft(type: Copy) {
-    def sourceDir = file(openALSoftFolder)
+    def sourceDir = file(openalsoftBuildDir + File.separator + openALSoftFolder)
     def outputDir = file(openalsoftBuildJniDir)
     def outputDir = file(openalsoftBuildJniDir)
 //    println "copyOpenALSoft sourceDir: " + sourceDir
 //    println "copyOpenALSoft sourceDir: " + sourceDir
 //    println "copyOpenALSoft outputDir: " + outputDir
 //    println "copyOpenALSoft outputDir: " + outputDir