diff --git a/lime/_macros/AssetsMacro.hx b/lime/_macros/AssetsMacro.hx index f04a4b4b9..1e3a98a28 100644 --- a/lime/_macros/AssetsMacro.hx +++ b/lime/_macros/AssetsMacro.hx @@ -7,6 +7,9 @@ import haxe.io.Bytes; import haxe.macro.Context; import haxe.macro.Expr; import haxe.macro.Type; +#end + +#if (macro && !display) import haxe.Serializer; import lime.graphics.ImageBuffer; import sys.io.File; @@ -63,6 +66,8 @@ class AssetsMacro { if (fields != null) { + #if !display + var constructor = macro { #if lime_console @@ -77,6 +82,8 @@ class AssetsMacro { var args = [ { name: "length", opt: false, type: macro :Int }, { name: "bytesData", opt: false, type: macro :haxe.io.BytesData } ]; fields.push ({ name: "new", access: [ APublic ], kind: FFun({ args: args, expr: constructor, params: [], ret: null }), pos: Context.currentPos () }); + #end + } return fields; @@ -90,6 +97,8 @@ class AssetsMacro { if (fields != null) { + #if !display + var constructor = macro { super (); @@ -106,6 +115,8 @@ class AssetsMacro { var args = [ { name: "length", opt: true, type: macro :Int, value: macro 0 } ]; fields.push ({ name: "new", access: [ APublic ], kind: FFun({ args: args, expr: constructor, params: [], ret: null }), pos: Context.currentPos () }); + #end + } return fields; @@ -115,6 +126,8 @@ class AssetsMacro { private static function embedData (metaName:String, encode:Bool = false):Array { + #if !display + var classType = Context.getLocalClass().get(); var metaData = classType.meta.get(); var position = Context.currentPos(); @@ -195,6 +208,8 @@ class AssetsMacro { } + #end + return null; } @@ -212,6 +227,8 @@ class AssetsMacro { var path = ""; var glyphs = "32-255"; + #if !display + for (meta in metaData) { if (meta.name == ":font") { @@ -284,6 +301,8 @@ class AssetsMacro { } + #end + return fields; } @@ -299,6 +318,8 @@ class AssetsMacro { if (fields != null) { + #if !display + var constructor = macro { #if html5 @@ -357,6 +378,8 @@ class AssetsMacro { fields.push ({ name: "new", access: [ APublic ], kind: FFun({ args: args, expr: constructor, params: [], ret: null }), pos: Context.currentPos() }); + #end + } return fields; @@ -370,7 +393,7 @@ class AssetsMacro { if (fields != null) { - #if (openfl && !html5) // CFFILoader.h(248) : NOT Implemented:api_buffer_data + #if (openfl && !html5 && !display) // CFFILoader.h(248) : NOT Implemented:api_buffer_data var constructor = macro {