diff --git a/core/src/io/anuke/mindustry/io/SaveFileReader.java b/core/src/io/anuke/mindustry/io/SaveFileReader.java index a969776896..8384aca50e 100644 --- a/core/src/io/anuke/mindustry/io/SaveFileReader.java +++ b/core/src/io/anuke/mindustry/io/SaveFileReader.java @@ -14,9 +14,7 @@ public abstract class SaveFileReader{ protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput); protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream(); protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall); - protected final ObjectMap fallback = ObjectMap.of( - - ); + protected final ObjectMap fallback = ObjectMap.of(); protected void region(String name, DataInput stream, CounterInputStream counter, IORunner cons) throws IOException{ counter.resetCount(); diff --git a/desktop-sdl/build.gradle b/desktop-sdl/build.gradle index 2434010234..3b5b046ac1 100644 --- a/desktop-sdl/build.gradle +++ b/desktop-sdl/build.gradle @@ -37,10 +37,7 @@ task dist(type: Jar, dependsOn: classes){ //use target = all for all platforms def target = getTarget() - if(target.contains("windows")){ - def prefix = target.contains("32") ? "64" : "" - exclude('**.so', "**.dylib", "sdl-arc${prefix}.dll", "gdx${prefix}.dll", "gdx-freetype${prefix}.dll", "**/music/**", "**/sounds/**") - } + if(target.contains("windows")) exclude('**.so', "**.dylib", "**/music/**", "**/sounds/**") if(target == "mac") exclude('**.so', "**.dll") if(target == "linux") exclude('**.dll', "**.dylib") archivesBaseName = appName + "-" + target diff --git a/ios/build.gradle b/ios/build.gradle index 443aaf085b..d9c294541d 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -32,7 +32,10 @@ task copyAssets(){ } } -build.dependsOn copyAssets +createIPA.dependsOn copyAssets +launchIPhoneSimulator.dependsOn copyAssets +launchIOSDevice.dependsOn copyAssets +launchIPadSimulator.dependsOn copyAssets launchIPhoneSimulator.dependsOn build launchIPadSimulator.dependsOn build