From 6c81312c068d3884fee06633cc9f0b41f48095eb Mon Sep 17 00:00:00 2001 From: Guilherme Werner Date: Fri, 16 Feb 2024 21:29:11 -0300 Subject: [PATCH] Load assets from root folder --- build.rs | 18 +----------------- src/asset.rs | 6 ++---- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/build.rs b/build.rs index e97d8d0..860a5fc 100644 --- a/build.rs +++ b/build.rs @@ -1,19 +1,3 @@ -use anyhow::*; -use fs_extra::copy_items; -use fs_extra::dir::CopyOptions; -use std::env; - -fn main() -> Result<()> { +fn main() { println!("cargo:rerun-if-changed=assets/*"); - - let out_dir = env::var("OUT_DIR")?; - let mut copy_options = CopyOptions::new(); - copy_options.overwrite = true; - - let mut paths_to_copy = Vec::new(); - paths_to_copy.push("assets/"); - - copy_items(&paths_to_copy, out_dir, ©_options)?; - - Ok(()) } diff --git a/src/asset.rs b/src/asset.rs index c199e70..166d1ff 100644 --- a/src/asset.rs +++ b/src/asset.rs @@ -23,8 +23,7 @@ pub async fn load_string(file_name: &str) -> anyhow::Result { .text() .await?; } else { - let path = std::path::Path::new(env!("OUT_DIR")) - .join("assets") + let path = std::path::Path::new("assets") .join(file_name); let txt = std::fs::read_to_string(path)?; } @@ -43,8 +42,7 @@ pub async fn load_binary(file_name: &str) -> anyhow::Result> { .await? .to_vec(); } else { - let path = std::path::Path::new(env!("OUT_DIR")) - .join("assets") + let path = std::path::Path::new("assets") .join(file_name); let data = std::fs::read(path)?; }