Browse Source

bugfix in ndll loading on windows when HAXEPATH does not ends with / (having two / is actually fine)

Nicolas Cannasse 12 years ago
parent
commit
9248ea05ab
1 changed files with 2 additions and 2 deletions
  1. 2 2
      genneko.ml

+ 2 - 2
genneko.ml

@@ -708,7 +708,7 @@ let generate_libs_init = function
 			var @s = $loader.loadprim("std@sys_string",0)();
 			var @env = $loader.loadprim("std@get_env",1);
 			var @b = if( @s == "Windows" )
-				@env("HAXEPATH") + "lib\\"
+				@env("HAXEPATH") + "\\lib\\"
 				else try $loader.loadprim("std@file_contents",1)(@env("HOME")+"/.haxelib") + "/"
 				catch e if( @s == "Linux" ) "/usr/lib/haxe/lib/" else "/usr/local/lib/haxe/lib/";
 			if( $loader.loadprim("std@sys_is64",0)() ) @s = @s + 64;
@@ -727,7 +727,7 @@ let generate_libs_init = function
 				"@s",Some (call p (loadp "sys_string" 0) []);
 				"@env",Some (loadp "get_env" 1);
 				"@b", Some (EIf (op "==" es (str p "Windows"),
-					op "+" (call p (ident p "@env") [str p "HAXEPATH"]) (str p "lib\\"),
+					op "+" (call p (ident p "@env") [str p "HAXEPATH"]) (str p "\\lib\\"),
 					Some (ETry (
 						op "+" (call p (loadp "file_contents" 1) [op "+" (call p (ident p "@env") [str p "HOME"]) (str p "./haxelib")]) (str p "/"),
 						"e",