Merge pull request #394 from vroad/nodejs-fix

Fix compile error on nodejs
2015-03-29 10:42:32 -07:00
parent 272acef5f5 11d3c48691
commit 345b24daf9
2 changed files with 2 additions and 2 deletions
--- a/haxe/Timer.hx
+++ b/haxe/Timer.hx
@@ -1,5 +1,5 @@
 package haxe;
-#if (macro || (!neko && !cpp))
+#if (macro || (!neko && !cpp && !nodejs))


 // Original haxe.Timer class
--- a/lime/text/Font.hx
+++ b/lime/text/Font.hx
@@ -15,7 +15,7 @@ import js.html.CanvasRenderingContext2D;

@:access(lime.text.Glyph)

-#if !display
+#if (!display && !nodejs)
@:autoBuild(lime.Assets.embedFont())
 #end