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

Merge branch 'arc-port' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2018-12-28 22:22:08 -05:00
parent c097841d78 9ec1d8f16b
commit bbb2153112
350 changed files with 4160 additions and 5081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
build.gradle
View File

@@ -88,13 +88,14 @@ project(":desktop"){
dependencies{
compile project(":core")
compile project(":kryonet")
compile project(":net")
if(new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null) compile project(":debug")
compile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile "com.badlogicgames.gdx:gdx-controllers-lwjgl3:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
compile project(":Arc:backends:backend-lwjgl3")
compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.0'
}
}
@@ -145,11 +146,12 @@ project(":ios"){
dependencies{
compile project(":core")
implementation project(":kryonet")
compile project(":net")
compile project(":Arc:backends:backend-robovm")
compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
}
@@ -168,20 +170,14 @@ project(":core"){
def comp = System.properties["release"] == null || System.properties["release"] == "false"
if(!comp) println("Note: Compiling release build.")
if(new File(projectDir.parent, '../uCore').exists() && comp){
compile project(":uCore")
if(new File(projectDir.parent, '../Arc').exists() && comp){
compile project(":Arc:arc-core")
compile project(":Arc:extensions:freetype")
}else{
compile "com.github.anuken:ucore:$uCoreVersion"
//TODO compile arc from jitpack
//compile 'com.github.Anuken.Arc:arc:-SNAPSHOT'
}
if(new File(projectDir.parent, '../GDXGifRecorder').exists() && comp){
compile project(":GDXGifRecorder")
}
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
compileOnly project(":annotations")
annotationProcessor project(":annotations")
}
@@ -190,18 +186,10 @@ project(":core"){
project(":server"){
apply plugin: "java"
configurations{
if(findProject(":android") != null){
compile.exclude module: android
}
}
dependencies{
compile project(":core")
compile project(":kryonet")
compile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile project(":net")
compile project(":Arc:backends:backend-headless")
}
}
@@ -212,8 +200,7 @@ project(":tests"){
testImplementation project(":core")
testImplementation('org.junit.jupiter:junit-jupiter-api:5.1.0')
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.1.0')
testImplementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
testImplementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile project(":Arc:backends:backend-headless")
}
test{
@@ -238,13 +225,13 @@ project(":annotations"){
}
}
project(":kryonet"){
project(":net"){
apply plugin: "java"
dependencies{
compile project(":core")
compile "org.lz4:lz4-java:1.4.1"
compile 'com.github.Anuken:kryonet:53b10247b1'
compile 'com.github.Anuken:kryonet:38ca8d51b5763ebe463ed973a63b64390ff51416'
compile 'com.github.Anuken:WaifUPnP:05eb46bc577fd7674596946ba288c96c0cedd893'
}
}