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

fixed unnecessary asset copying

Browse Source
This commit is contained in:
Anuken
2019-08-14 13:47:16 -04:00
parent d56565990e
commit d0bd29cfa0
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/io/SaveFileReader.java
View File

@@ -14,9 +14,7 @@ public abstract class SaveFileReader{
protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput); protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput);
protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream(); protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream();
protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall); protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall);
protected final ObjectMap<String, String> fallback = ObjectMap.of( protected final ObjectMap<String, String> fallback = ObjectMap.of();
);
protected void region(String name, DataInput stream, CounterInputStream counter, IORunner<DataInput> cons) throws IOException{ protected void region(String name, DataInput stream, CounterInputStream counter, IORunner<DataInput> cons) throws IOException{
counter.resetCount(); counter.resetCount();

5
desktop-sdl/build.gradle
View File

@@ -37,10 +37,7 @@ task dist(type: Jar, dependsOn: classes){
//use target = all for all platforms //use target = all for all platforms
def target = getTarget() def target = getTarget()
if(target.contains("windows")){ if(target.contains("windows")) exclude('**.so', "**.dylib", "**/music/**", "**/sounds/**")
def prefix = target.contains("32") ? "64" : ""
exclude('**.so', "**.dylib", "sdl-arc${prefix}.dll", "gdx${prefix}.dll", "gdx-freetype${prefix}.dll", "**/music/**", "**/sounds/**")
}
if(target == "mac") exclude('**.so', "**.dll") if(target == "mac") exclude('**.so', "**.dll")
if(target == "linux") exclude('**.dll', "**.dylib") if(target == "linux") exclude('**.dll', "**.dylib")
archivesBaseName = appName + "-" + target archivesBaseName = appName + "-" + target

5
ios/build.gradle
View File

@@ -32,7 +32,10 @@ task copyAssets(){
} }
} }
build.dependsOn copyAssets createIPA.dependsOn copyAssets
launchIPhoneSimulator.dependsOn copyAssets
launchIOSDevice.dependsOn copyAssets
launchIPadSimulator.dependsOn copyAssets
launchIPhoneSimulator.dependsOn build launchIPhoneSimulator.dependsOn build
launchIPadSimulator.dependsOn build launchIPadSimulator.dependsOn build