From 9637253bbe6a7d5fc6048ce4645c725c4517c736 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Wed, 25 Mar 2015 13:39:49 -0700 Subject: [PATCH] Fix iOS assets --- lime/Assets.hx | 2 +- templates/haxe/DefaultAssetLibrary.hx | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lime/Assets.hx b/lime/Assets.hx index 50791609b..50663539f 100644 --- a/lime/Assets.hx +++ b/lime/Assets.hx @@ -1,5 +1,4 @@ package lime; -import lime.graphics.ImageBuffer; #if !macro @@ -1238,6 +1237,7 @@ import haxe.macro.Context; import haxe.macro.Expr; import haxe.macro.Type; import haxe.Serializer; +import lime.graphics.ImageBuffer; import sys.io.File; diff --git a/templates/haxe/DefaultAssetLibrary.hx b/templates/haxe/DefaultAssetLibrary.hx index fdb76ed8a..2392c8e67 100644 --- a/templates/haxe/DefaultAssetLibrary.hx +++ b/templates/haxe/DefaultAssetLibrary.hx @@ -561,6 +561,8 @@ class DefaultAssetLibrary extends AssetLibrary { var bytes = ByteArray.readFile ("assets/manifest"); #elseif (mac && java) var bytes = ByteArray.readFile ("../Resources/manifest"); + #elseif ios + var bytes = ByteArray.readFile ("assets/manifest"); #else var bytes = ByteArray.readFile ("manifest"); #end @@ -581,7 +583,11 @@ class DefaultAssetLibrary extends AssetLibrary { if (!className.exists (asset.id)) { + #if ios + path.set (asset.id, "assets/" + asset.path); + #else path.set (asset.id, asset.path); + #end type.set (asset.id, cast (asset.type, AssetType)); }