diff --git a/assets/icon.ico b/assets/icon.ico deleted file mode 100644 index c2e5557..0000000 Binary files a/assets/icon.ico and /dev/null differ diff --git a/assets/icon.png b/assets/icon.png deleted file mode 100644 index f3d61fe..0000000 Binary files a/assets/icon.png and /dev/null differ diff --git a/assets/icon.svg b/assets/icon.svg deleted file mode 100644 index a3ee4ce..0000000 --- a/assets/icon.svg +++ /dev/null @@ -1,664 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - B - A - - - - - - - - Start Select - Power - - - - - - diff --git a/assets/icon_cropped_small.png b/assets/icon_cropped_small.png deleted file mode 100644 index 5261849..0000000 Binary files a/assets/icon_cropped_small.png and /dev/null differ diff --git a/platform/rustboyadvance-sdl2/Cargo.toml b/platform/rustboyadvance-sdl2/Cargo.toml index 54d2f9c..6720506 100644 --- a/platform/rustboyadvance-sdl2/Cargo.toml +++ b/platform/rustboyadvance-sdl2/Cargo.toml @@ -22,4 +22,4 @@ winres = "0.1" # [features] # default = ["gdb"] # debugger = ["rustboyadvance-core/debugger"] -# gdb = ["rustboyadvance-core/gdb"] \ No newline at end of file +# gdb = ["rustboyadvance-core/gdb"] diff --git a/platform/rustboyadvance-sdl2/src/video.rs b/platform/rustboyadvance-sdl2/src/video.rs index 1bc5f84..10f6cf8 100644 --- a/platform/rustboyadvance-sdl2/src/video.rs +++ b/platform/rustboyadvance-sdl2/src/video.rs @@ -1,8 +1,7 @@ -use sdl2::image::{InitFlag, LoadSurface, Sdl2ImageContext}; +use sdl2::image::{InitFlag, Sdl2ImageContext}; use sdl2::pixels::{Color, PixelFormatEnum}; use sdl2::rect::Rect; use sdl2::render::{Texture, TextureCreator, WindowCanvas}; -use sdl2::surface::Surface; use sdl2::video::WindowContext; use sdl2::{Sdl, VideoSubsystem}; @@ -25,16 +24,13 @@ pub struct Renderer<'a> { pub fn init(sdl_context: &Sdl) -> Result, Box> { let video_subsystem = sdl_context.video()?; let image_context = sdl2::image::init(InitFlag::PNG | InitFlag::JPG)?; - let mut window = video_subsystem - .window("RustBoyAdvance", SCREEN_WIDTH * 3, SCREEN_HEIGHT * 3) + let window = video_subsystem + .window("rustboyadvance", SCREEN_WIDTH * 3, SCREEN_HEIGHT * 3) .opengl() .position_centered() .resizable() .build()?; - let window_icon = Surface::from_file("assets/icon.png")?; - window.set_icon(window_icon); - let mut canvas = window.into_canvas().accelerated().build()?; canvas.set_logical_size(SCREEN_WIDTH, SCREEN_HEIGHT)?;