瀏覽代碼

added haxelib -D in path command (fixed issue #279)

Nicolas Cannasse 14 年之前
父節點
當前提交
6997a7e576
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 6 2
      main.ml
  2. 1 0
      std/tools/haxelib/Main.hx

+ 6 - 2
main.ml

@@ -499,10 +499,14 @@ try
 		let lines = List.fold_left (fun acc l ->
 		let lines = List.fold_left (fun acc l ->
 			let p = String.length l - 1 in
 			let p = String.length l - 1 in
 			let l = (if l.[p] = '\r' then String.sub l 0 p else l) in
 			let l = (if l.[p] = '\r' then String.sub l 0 p else l) in
-			if p > 3 && String.sub l 0 3 = "-L " then begin
+			match (if p > 3 then String.sub l 0 3 else "") with
+			| "-D " ->
+				Common.define com (String.sub l 3 (String.length l - 3));
+				acc
+			| "-L " ->
 				libs := String.sub l 3 (String.length l - 3) :: !libs;
 				libs := String.sub l 3 (String.length l - 3) :: !libs;
 				acc
 				acc
-			end else
+			| _ ->
 				l :: acc
 				l :: acc
 		) [] lines in
 		) [] lines in
 		if ret <> Unix.WEXITED 0 then failwith (String.concat "\n" lines);
 		if ret <> Unix.WEXITED 0 then failwith (String.concat "\n" lines);

+ 1 - 0
std/tools/haxelib/Main.hx

@@ -707,6 +707,7 @@ class Main {
 				neko.Lib.println("-L "+pdir+"ndll/");
 				neko.Lib.println("-L "+pdir+"ndll/");
 			}
 			}
 			neko.Lib.println(dir);
 			neko.Lib.println(dir);
+			neko.Lib.println("-D "+d.project);
 		}
 		}
 	}
 	}