From 277bbe6ae390f357b347867666687134ceb693fc Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Tue, 10 Sep 2019 10:49:56 -0700 Subject: [PATCH] Minor compile fixes --- tools/utils/JavaExternGenerator.hx | 5 ++--- tools/utils/PlatformSetup.hx | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/utils/JavaExternGenerator.hx b/tools/utils/JavaExternGenerator.hx index 2db29b1cd..5213e7f35 100644 --- a/tools/utils/JavaExternGenerator.hx +++ b/tools/utils/JavaExternGenerator.hx @@ -4,14 +4,13 @@ import haxe.crypto.BaseCode; import haxe.io.Bytes; import haxe.io.Input; import haxe.io.Output; +import haxe.zip.Compress; import haxe.zip.Reader; import hxp.*; import lime.tools.HXProject; import sys.io.File; import sys.io.Process; import sys.FileSystem; -import neko.Lib; -import neko.zip.Compress; class JavaExternGenerator { @@ -145,7 +144,7 @@ class JavaExternGenerator private function generate(inClass:String, inMembers:Map) { - Lib.println(inClass); + Sys.println(inClass); var parts = Path.withoutExtension(inClass).split("/"); var old_type = mCurrentType; diff --git a/tools/utils/PlatformSetup.hx b/tools/utils/PlatformSetup.hx index 17b0df33a..a6c502c1e 100644 --- a/tools/utils/PlatformSetup.hx +++ b/tools/utils/PlatformSetup.hx @@ -1219,7 +1219,7 @@ class Progress extends haxe.io.Output { var o:haxe.io.Output; var cur:Int; - var max:Int; + var max:Null; var start:Float; public function new(o) @@ -1267,7 +1267,7 @@ class Progress extends haxe.io.Output } } - public override function prepare(m) + public override function prepare(m:Int) { max = m; }