Fixed all code generation errors

This commit is contained in:
Anuken
2019-01-06 09:42:08 -05:00
parent 1346e163e9
commit 397da91ab4
5 changed files with 29 additions and 25 deletions

View File

@@ -131,24 +131,6 @@ project(":ios"){
apply plugin: "java"
apply plugin: "robovm"
task copyGen{
doLast{
copy{
from("../core/build/classes/java/main/io/anuke/mindustry/gen/"){
include "**/*.java"
}
into "../core/src/io/anuke/mindustry/gen"
}
}
doFirst{
delete{
delete "../core/src/io/anuke/mindustry/gen/"
}
}
}
task incrementConfig{
def vfile = file('robovm.properties')
@@ -166,11 +148,6 @@ project(":ios"){
props.store(vfile.newWriter(), null)
}
build.dependsOn(incrementConfig)
if(file('robovm.properties').exists()){
build.dependsOn(copyGen)
}
dependencies{
compile project(":core")
compile project(":net")
@@ -191,8 +168,29 @@ project(":core"){
generateLocales()
}
task cleanGen{
doFirst{
delete{
delete "../core/src/io/anuke/mindustry/gen/"
}
}
}
task copyGen{
doLast{
copy{
from("../core/build/classes/java/main/io/anuke/mindustry/gen/"){
include "**/*.java"
}
into "../core/src/io/anuke/mindustry/gen"
}
}
}
dependencies{
build.finalizedBy(finish)
compileJava.dependsOn(cleanGen)
build.finalizedBy(copyGen)
compile arcModule("arc-core")
compile arcModule("extensions:freetype")