Browse Source

Document -D hl-ver in define.json

Jens Fischer 5 years ago
parent
commit
d6d4d3036a
3 changed files with 9 additions and 2 deletions
  1. 7 0
      src-json/define.json
  2. 1 1
      src/compiler/haxe.ml
  3. 1 1
      src/generators/genhl.ml

+ 7 - 0
src-json/define.json

@@ -238,6 +238,13 @@
 		"define": "haxe",
 		"doc": "The current Haxe version value in SemVer format."
 	},
+	{
+		"name": "HlVer",
+		"define": "hl_ver",
+		"doc": "The HashLink version to target. (default: 1.10.0)",
+		"platforms": ["hl"],
+		"params": ["version"]
+	},
 	{
 		"name": "HxcppApiLevel",
 		"define": "hxcpp_api_level",

+ 1 - 1
src/compiler/haxe.ml

@@ -273,7 +273,7 @@ module Initialize = struct
 				"python"
 			| Hl ->
 				add_std "hl";
-				if not (Common.raw_defined com "hl_ver") then Define.raw_define_value com.defines "hl_ver" (try Std.input_file (Common.find_file com "hl/hl_version") with Not_found -> assert false);
+				if not (Common.defined com Define.HlVer) then Define.define_value com.defines Define.HlVer (try Std.input_file (Common.find_file com "hl/hl_version") with Not_found -> assert false);
 				"hl"
 			| Eval ->
 				add_std "eval";

+ 1 - 1
src/generators/genhl.ml

@@ -3309,7 +3309,7 @@ let generate_static ctx c f =
 			| (Meta.HlNative,[(EConst(String(lib,_)),_)] ,_ ) :: _ ->
 				add_native lib f.cf_name
 			| (Meta.HlNative,[(EConst(Float(ver)),_)] ,_ ) :: _ ->
-				let cur_ver = (try Common.raw_defined_value ctx.com "hl-ver" with Not_found -> "") in
+				let cur_ver = (try Common.defined_value ctx.com Define.HlVer with Not_found -> "") in
 				if cur_ver < ver then
 					let gen_content() =
 						op ctx (OThrow (make_string ctx ("Requires compiling with -D hl-ver=" ^ ver ^ ".0 or higher") null_pos));