diff --git a/src/data/builtin/icon.bmp b/res/nx_icon.bmp similarity index 100% rename from src/data/builtin/icon.bmp rename to res/nx_icon.bmp diff --git a/src/data/builtin/icon2.bmp b/res/sue.bmp similarity index 100% rename from src/data/builtin/icon2.bmp rename to res/sue.bmp diff --git a/src/data/builtin_fs.rs b/src/data/builtin_fs.rs index b9b7f16..788bc89 100644 --- a/src/data/builtin_fs.rs +++ b/src/data/builtin_fs.rs @@ -102,8 +102,7 @@ impl BuiltinFS { FSNode::File("builtin_font_0.png", include_bytes!("builtin/builtin_font_0.png")), FSNode::File("builtin_font_1.png", include_bytes!("builtin/builtin_font_1.png")), FSNode::File("gamecontrollerdb.txt", include_bytes!("builtin/gamecontrollerdb.txt")), - FSNode::File("icon.bmp", include_bytes!("builtin/icon.bmp")), - FSNode::File("icon2.bmp", include_bytes!("builtin/icon2.bmp")), + FSNode::File("icon.bmp", include_bytes!("../../res/sue.bmp")), FSNode::File( "organya-wavetable-doukutsu.bin", include_bytes!("builtin/organya-wavetable-doukutsu.bin"), diff --git a/src/framework/backend_glutin.rs b/src/framework/backend_glutin.rs index ecd8569..d89ac39 100644 --- a/src/framework/backend_glutin.rs +++ b/src/framework/backend_glutin.rs @@ -87,7 +87,7 @@ impl GlutinEventLoop { #[cfg(not(any(target_os = "windows", target_os = "android", target_os = "horizon")))] { - let mut file = filesystem::open(&ctx, "/builtin/icon2.bmp").unwrap(); + let mut file = filesystem::open(&ctx, "/builtin/icon.bmp").unwrap(); let mut buf: Vec = Vec::new(); file.read_to_end(&mut buf); diff --git a/src/framework/backend_sdl2.rs b/src/framework/backend_sdl2.rs index de26712..79c2c4e 100644 --- a/src/framework/backend_sdl2.rs +++ b/src/framework/backend_sdl2.rs @@ -182,7 +182,7 @@ impl SDL2EventLoop { let mut window = win_builder.build().map_err(|e| GameError::WindowError(e.to_string()))?; #[cfg(not(any(target_os = "windows", target_os = "android", target_os = "horizon")))] { - let mut file = filesystem::open(&ctx, "/builtin/icon2.bmp").unwrap(); + let mut file = filesystem::open(&ctx, "/builtin/icon.bmp").unwrap(); let mut buf: Vec = Vec::new(); file.read_to_end(&mut buf)?;