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

Disabled controller support

Browse Source
This commit is contained in:
Anuken
2017-12-24 20:50:00 -05:00
parent 740b996c69
commit 560ab4d379
4 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build.gradle
View File

@@ -84,12 +84,21 @@ project(":core") {
apply plugin: "java" apply plugin: "java"
dependencies { dependencies {
if(new File('../uCore').exists()){ boolean comp = System.properties["release"] == null || System.properties["release"].equals("false");
if(!comp){
println("NOTICE: Compiling release build.")
}else{
println("Compiling DEBUG build.");
}
if(new File('../uCore').exists() && comp){
compile project(":uCore") compile project(":uCore")
}else{ }else{
compile "com.github.anuken:ucore:$uCoreVersion" compile "com.github.anuken:ucore:$uCoreVersion"
} }
if(new File('../GDXGifRecorder').exists()) {
if(new File('../GDXGifRecorder').exists() && comp) {
compile project(":GDXGifRecorder") compile project(":GDXGifRecorder")
} }
compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx:$gdxVersion"

8
core/src/io/anuke/mindustry/ui/MindustrySettingsDialog.java
View File

@@ -57,10 +57,10 @@ public class MindustrySettingsDialog extends SettingsDialog{
menu.row(); menu.row();
menu.addButton("Sound", () -> visible(2)); menu.addButton("Sound", () -> visible(2));
//if(!Vars.android) { if(!Vars.android) {
menu.row(); menu.row();
menu.addButton("Controls", () -> Vars.ui.showControls()); menu.addButton("Controls", () -> Vars.ui.showControls());
//} }
prefs.clearChildren(); prefs.clearChildren();
prefs.add(menu); prefs.add(menu);

6
desktop/build.gradle
View File

@@ -50,8 +50,10 @@ ext.getPlatform = {
if (project.hasProperty("platform")) { if (project.hasProperty("platform")) {
def lc = platform.toLowerCase() def lc = platform.toLowerCase()
if(lc.equals("windows")){ if(lc.equals("windows64")) {
return "windows64"; return "windows64";
}else if(lc.equals("windows32")){
return "windows32";
}else if(lc.equals("linux")){ }else if(lc.equals("linux")){
return "linux64"; return "linux64";
}else if(lc.equals("mac")){ }else if(lc.equals("mac")){

18
settings.gradle
View File

@@ -1,11 +1,15 @@
include 'desktop', 'html', 'core', 'android' include 'desktop', 'html', 'core', 'android'
if (new File(settingsDir, '../uCore').exists()) { if(System.properties["release"] == null || System.properties["release"].equals("false")){
include ':uCore' if (new File(settingsDir, '../uCore').exists()) {
project(':uCore').projectDir = new File(settingsDir, '../uCore') include ':uCore'
} project(':uCore').projectDir = new File(settingsDir, '../uCore')
}
if (new File(settingsDir, '../GDXGifRecorder').exists()) { if (new File(settingsDir, '../GDXGifRecorder').exists()) {
include ':GDXGifRecorder' include ':GDXGifRecorder'
project(':GDXGifRecorder').projectDir = new File(settingsDir, '../GDXGifRecorder') project(':GDXGifRecorder').projectDir = new File(settingsDir, '../GDXGifRecorder')
}
}else{
println("Not including local repositories.")
} }