Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2018-11-30 23:12:52 -05:00
parent 236e3c7e61 2160844ad0
commit 9f9d57b9a9
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@@ -104,17 +104,19 @@ project(":ios") {
apply plugin: "robovm" apply plugin: "robovm"
task copyGen{ task copyGen{
copy{ doLast {
from ("core/build/classes/java/main/io/anuke/mindustry/gen/"){ copy {
include "**/*.java" from("../core/build/classes/java/main/io/anuke/mindustry/gen/") {
} include "**/*.java"
}
into "core/src/io/anuke/mindustry/gen" into "../core/src/io/anuke/mindustry/gen"
}
} }
doFirst{ doFirst{
delete{ delete{
delete "core/src/io/anuke/mindustry/gen/" delete "../core/src/io/anuke/mindustry/gen/"
} }
} }
} }
@@ -132,7 +134,7 @@ project(":ios") {
props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher' props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
props['app.executable'] = 'IOSLauncher' props['app.executable'] = 'IOSLauncher'
props['app.name'] = 'Mindustry' props['app.name'] = 'Mindustry'
props['app.build'] = (!props.hasProperty("app.build") ? 40 : props['app.build'].toInteger() + 1)+"" props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1)+""
props.store(vfile.newWriter(), null) props.store(vfile.newWriter(), null)
} }
@@ -148,7 +150,7 @@ project(":ios") {
compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios" compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
compileOnly project(":annotations") //compileOnly project(":annotations")
} }
} }