From e90ebae6f6e5912d98e60b42d390f223cdf1b2a6 Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Sun, 11 Jul 2021 01:30:04 +0000 Subject: [PATCH] engine: BUILD cleanups --- assets/shaders/BUILD | 4 ++-- engine/{BUILD => BUILD.bazel} | 13 +------------ engine/render/BUILD.bazel | 4 ++++ hsvr/BUILD.bazel | 5 ++++- 4 files changed, 11 insertions(+), 15 deletions(-) rename engine/{BUILD => BUILD.bazel} (64%) diff --git a/assets/shaders/BUILD b/assets/shaders/BUILD index d4c8de2..9b2e59c 100644 --- a/assets/shaders/BUILD +++ b/assets/shaders/BUILD @@ -5,7 +5,7 @@ glsl_binary( srcs = [ "forward.vert", ], - visibility = ["//engine:__pkg__"], + visibility = ["//engine/render:__pkg__"], ) glsl_binary( @@ -16,5 +16,5 @@ glsl_binary( "forward_brdf.frag", "forward_defs.frag", ], - visibility = ["//engine:__pkg__"], + visibility = ["//engine/render:__pkg__"], ) diff --git a/engine/BUILD b/engine/BUILD.bazel similarity index 64% rename from engine/BUILD rename to engine/BUILD.bazel index b42d066..065e4fe 100644 --- a/engine/BUILD +++ b/engine/BUILD.bazel @@ -23,21 +23,10 @@ rust_library( "//engine/physics", "//engine/render", "//lib/ecs", - "//third_party/cargo:cgmath", - "//third_party/cargo:image", "//third_party/cargo:mlua", "//third_party/cargo:log", - "//third_party/cargo:env_logger", ], - proc_macro_deps = [ - "//lib/ecs_macros", - ], - data = [ - "//assets:test-128px.png", - "//assets:test-128px-roughness.png", - "//assets/shaders:forward_vert", - "//assets/shaders:forward_frag", - ] + glob(["lua/**"]), + data = glob(["lua/**"]), visibility = [ "//visibility:public", ], diff --git a/engine/render/BUILD.bazel b/engine/render/BUILD.bazel index 4abe7e2..9a3c779 100644 --- a/engine/render/BUILD.bazel +++ b/engine/render/BUILD.bazel @@ -31,6 +31,10 @@ rust_library( "vulkan/swapchain_binding.rs", "vulkan/worker.rs", ], + data = [ + "//assets/shaders:forward_vert", + "//assets/shaders:forward_frag", + ], deps = [ "//engine/input", "//engine/util", diff --git a/hsvr/BUILD.bazel b/hsvr/BUILD.bazel index 58a761f..98d32ef 100644 --- a/hsvr/BUILD.bazel +++ b/hsvr/BUILD.bazel @@ -25,7 +25,10 @@ rust_binary( "//third_party/cargo:env_logger", "//third_party/cargo:log", ], - data = glob(["lua/**"]), + data = [ + "//assets:test-128px.png", + "//assets:test-128px-roughness.png", + ] + glob(["lua/**"]), ) abrasion_release(