diff --git a/.gitignore b/.gitignore index 2377dbee42..79cf5235d0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ logs/ /desktop/mindustry-maps/ /desktop/gifexport/ /core/lib/ +/ios/assets/ /core/assets-raw/sprites/generated/ /core/assets-raw/sprites_out/ /annotations/build/ diff --git a/ios/build.gradle b/ios/build.gradle index 4859a5c758..443aaf085b 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -7,6 +7,33 @@ ext{ mainClassName = "io.anuke.mindustry.IOSLauncher" } +task copyAssets(){ + delete{ + delete "assets/" + } + + copy{ + from "../core/assets" + into "assets/" + } + + exec{ + commandLine "sh", "./convert_audio.sh", "assets/sounds" + } + + exec{ + commandLine "sh", "./convert_audio.sh", "assets/music" + } + + delete{ + delete fileTree('assets') { + include '**/*.ogg' + } + } +} + +build.dependsOn copyAssets + launchIPhoneSimulator.dependsOn build launchIPadSimulator.dependsOn build launchIOSDevice.dependsOn build diff --git a/ios/convert_audio.sh b/ios/convert_audio.sh new file mode 100755 index 0000000000..c4772fadc3 --- /dev/null +++ b/ios/convert_audio.sh @@ -0,0 +1,7 @@ +#!/usr/bin/bash + +#convert ogg to .caf files for iOS +for i in $1/*.ogg; do + echo $i + ffmpeg -i "$i" "${i%.*}.caf" +done \ No newline at end of file diff --git a/ios/robovm.xml b/ios/robovm.xml index 146861dd40..2ce58a8572 100644 --- a/ios/robovm.xml +++ b/ios/robovm.xml @@ -7,7 +7,7 @@ Info.plist.xml - ../core/assets + ../ios/assets **