diff --git a/build.hancho b/build.hancho index ed5cb9b..727d74e 100644 --- a/build.hancho +++ b/build.hancho @@ -3,7 +3,8 @@ from hancho import * print("Building Matcheroni with Hancho") -if config.build_type is None: config.build_type = "debug" +#if config.build_type is None: config.build_type = "debug" +config.build_type = "release" config.build_dir = "build/{build_type}" diff --git a/config/rules.hancho b/config/rules.hancho index a6ca26c..488487a 100644 --- a/config/rules.hancho +++ b/config/rules.hancho @@ -21,7 +21,7 @@ link_c_lib = Rule( link_c_bin = Rule( desc = "Linking {files_out}", - command = "g++ {ld_opt} {warnings} {files_in} {deps} {sys_libs} -o {files_out}", + command = "g++ {ld_opt} {warnings} {files_in} {libs} {sys_libs} -o {files_out}", ld_opt = "{'-O3' if build_type == 'release' else '-g -O0'}", warnings = "-Wall", ) diff --git a/examples/c_lexer/c_lexer.hancho b/examples/c_lexer/c_lexer.hancho index ad72ad2..fe14d25 100644 --- a/examples/c_lexer/c_lexer.hancho +++ b/examples/c_lexer/c_lexer.hancho @@ -12,12 +12,12 @@ c_lexer_lib = rules.c_library( rules.c_test( "c_lexer_test.cpp", "c_lexer_test", - deps = c_lexer_lib, + libs = c_lexer_lib, quiet = True, ) rules.c_binary( "c_lexer_benchmark.cpp", "c_lexer_benchmark", - deps = c_lexer_lib, + libs = c_lexer_lib, ) diff --git a/examples/c_parser/c_parser.hancho b/examples/c_parser/c_parser.hancho index 16590f2..c20674c 100644 --- a/examples/c_parser/c_parser.hancho +++ b/examples/c_parser/c_parser.hancho @@ -13,13 +13,13 @@ c_parser_lib = rules.c_library( rules.c_binary( "c_parser_benchmark.cpp", "c_parser_benchmark", - deps = [c_lexer.c_lexer_lib, c_parser_lib], + libs = [c_lexer.c_lexer_lib, c_parser_lib], ) # Broken? #rules.c_test( # "c_parser_test.cpp", # "c_parser_test", -# deps = [c_lexer.c_lexer_lib, c_parser_lib], +# libs = [c_lexer.c_lexer_lib, c_parser_lib], # quiet = True #) diff --git a/examples/json/json.hancho b/examples/json/json.hancho index 2158fb2..511c7e0 100644 --- a/examples/json/json.hancho +++ b/examples/json/json.hancho @@ -12,24 +12,24 @@ json_parser = rules.c_library( rules.c_binary( "json_conformance.cpp", "json_conformance", - deps = json_parser + libs = json_parser ) rules.c_binary( "json_benchmark.cpp", "json_benchmark", - deps = json_parser, + libs = json_parser, ) rules.c_binary( "json_demo.cpp", "json_demo", - deps = json_parser, + libs = json_parser, ) rules.c_test( "json_test.cpp", "json_test", - deps = json_parser, + libs = json_parser, quiet = True ) diff --git a/examples/regex/regex.hancho b/examples/regex/regex.hancho index ea22e6e..42a2e3f 100644 --- a/examples/regex/regex.hancho +++ b/examples/regex/regex.hancho @@ -22,19 +22,19 @@ regex_parser = rules.c_library( rules.c_binary( "regex_demo.cpp", "regex_demo", - deps = regex_parser, + libs = regex_parser, ) rules.c_binary( "regex_benchmark.cpp", "regex_benchmark", - deps = regex_parser, + libs = regex_parser, sys_libs = "-lboost_system -lboost_regex", ) rules.c_test( "regex_test.cpp", "regex_test", - deps = regex_parser, + libs = regex_parser, quiet = True ) diff --git a/examples/toml/toml.hancho b/examples/toml/toml.hancho index 363682a..b8c7b6c 100644 --- a/examples/toml/toml.hancho +++ b/examples/toml/toml.hancho @@ -12,6 +12,6 @@ toml_lib = rules.c_library( rules.c_test( "toml_test.cpp", "toml_test", - deps = toml_lib, + libs = toml_lib, quiet = True ) diff --git a/examples/tutorial/tutorial.hancho b/examples/tutorial/tutorial.hancho index 047d797..cde83c3 100644 --- a/examples/tutorial/tutorial.hancho +++ b/examples/tutorial/tutorial.hancho @@ -16,5 +16,5 @@ rules.c_test("json_tut2b.cpp", "json_tut2b", quiet = True) rules.c_binary( "tiny_c_parser.cpp", "tiny_c_parser", - deps = [c_lexer.c_lexer_lib, c_parser.c_parser_lib], + libs = [c_lexer.c_lexer_lib, c_parser.c_parser_lib], )