Skip to content

Commit

Permalink
Migrating platform setup to new tools, removing access to old tools, …
Browse files Browse the repository at this point in the history
…removing HXSSL dependency (will have to refactor to use URLLoader instead)
  • Loading branch information
jgranick committed Feb 25, 2013
1 parent 11be61e commit ea90fc5
Show file tree
Hide file tree
Showing 9 changed files with 1,869 additions and 40 deletions.
Binary file removed ndll/Linux/tls.ndll
Binary file not shown.
Binary file removed ndll/Linux64/tls.ndll
Binary file not shown.
Binary file removed ndll/Mac/tls.ndll
Binary file not shown.
Binary file removed ndll/Windows/tls.ndll
Binary file not shown.
Binary file modified run.n
Binary file not shown.
1 change: 0 additions & 1 deletion tools/command-line/CommandLine.hxml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@
-lib xfl
--remap flash:nme
--remap browser:native
-D hxssl
-D nme_ver=3.6.0
22 changes: 18 additions & 4 deletions tools/command-line/src/CommandLineTools.hx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import platforms.WindowsPlatform;
import sys.io.File;
import sys.io.Process;
import sys.FileSystem;
import utils.PlatformSetup;

#if haxe3
import haxe.ds.StringMap;
Expand Down Expand Up @@ -962,11 +963,11 @@ class CommandLineTools {


private static function processArguments ():Void {

var arguments = Sys.args ();

nme = PathHelper.getHaxelib (new Haxelib ("nme"));

var lastCharacter = nme.substr ( -1, 1);

if (lastCharacter == "/" || lastCharacter == "\\") {
Expand Down Expand Up @@ -1108,7 +1109,20 @@ class CommandLineTools {

private static function platformSetup ():Void {


if (words.length == 0) {

PlatformSetup.run ();

} else if (words.length == 1) {

PlatformSetup.run (words[0]);

} else {

LogHelper.error ("Incorrect number of arguments for command 'setup'");
return;

}

}

Expand Down
Loading

0 comments on commit ea90fc5

Please sign in to comment.