Buildscript fixes
This commit is contained in:
@@ -40,9 +40,11 @@ android{
|
|||||||
renderscript.srcDirs = ['src']
|
renderscript.srcDirs = ['src']
|
||||||
res.srcDirs = ['res']
|
res.srcDirs = ['res']
|
||||||
assets.srcDirs = ['assets', 'src/main/assets', '../core/assets/']
|
assets.srcDirs = ['assets', 'src/main/assets', '../core/assets/']
|
||||||
jniLibs.srcDirs = ['libs']
|
|
||||||
if(localArc){
|
if(localArc){
|
||||||
jniLibs.srcDirs += ['../../Arc/natives/natives-android/libs', '../../Arc/natives/natives-freetype-android/libs']
|
jniLibs.srcDirs += ['../../Arc/natives/natives-android/libs', '../../Arc/natives/natives-freetype-android/libs']
|
||||||
|
}else{
|
||||||
|
jniLibs.srcDirs = ['libs']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ if(hasSdk){
|
|||||||
println("No Android SDK found. Skipping Android module.")
|
println("No Android SDK found. Skipping Android module.")
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!hasProperty("release") && !hasProperty("noLocalArc")){
|
if(!hasProperty("noLocalArc")){
|
||||||
if(new File(rootDir.parent, 'Arc').exists()){
|
if(new File(rootDir.parent, 'Arc').exists()){
|
||||||
println("Compiling with localArc")
|
println("Compiling with localArc")
|
||||||
includeBuild("../Arc")
|
includeBuild("../Arc")
|
||||||
|
|||||||
Reference in New Issue
Block a user