diff --git a/.bazelversion b/.bazelversion index 0ee843cc..15020207 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.2.0 +7.3.0 diff --git a/.editorconfig b/.editorconfig index 0b3779e5..250ffac3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,3 +3,12 @@ root = true [*] end_of_line = lf insert_final_newline = true + +[*.{cc,hh,cpp,hpp}] +# matching .clang-format IndentWidth +indent_size = 2 + +[*.{bzl,bazel}] +# matches output of buildifier +indent_size = 4 +indent_style = space diff --git a/dylib/index.bzl b/dylib/index.bzl index 6c7730f2..9bd4358a 100644 --- a/dylib/index.bzl +++ b/dylib/index.bzl @@ -26,7 +26,8 @@ def cc_ecsact_dylib(name = None, srcs = [], ecsact_modules = [], deps = [], defi name = name, deps = deps + ["@ecsact_runtime//:dylib", "@ecsact_runtime//dylib:util"] + ["@ecsact_runtime//:{}".format(m) for m in ecsact_modules], srcs = srcs + ["@ecsact_runtime//dylib:dylib.cc"], - defines = defines + - ["ECSACT_{}_API_LOAD_AT_RUNTIME".format(m.upper()) for m in ecsact_modules], + defines = # + defines + + ["ECSACT_{}_API_LOAD_AT_RUNTIME".format(m.upper()) for m in ecsact_modules], **kwargs )