Compare commits

...

3 commits

2 changed files with 17 additions and 6 deletions

View file

@ -16,6 +16,8 @@ use gb_emu_lib::{
use gilrs::{Button, Gilrs}; use gilrs::{Button, Gilrs};
use image::ImageBuffer; use image::ImageBuffer;
use raw_window_handle::HasDisplayHandle; use raw_window_handle::HasDisplayHandle;
#[cfg(target_os = "linux")]
use winit::platform::wayland::WindowBuilderExtWayland;
use winit::{ use winit::{
dpi::PhysicalSize, dpi::PhysicalSize,
event::{Event, WindowEvent}, event::{Event, WindowEvent},
@ -337,8 +339,10 @@ where
) -> anyhow::Result<(Self, RendererChannel)> { ) -> anyhow::Result<(Self, RendererChannel)> {
let window = WindowBuilder::new() let window = WindowBuilder::new()
.with_title("Gameboy") .with_title("Gameboy")
.with_resizable(resizable) .with_resizable(resizable);
.build(event_loop)?; #[cfg(target_os = "linux")]
let window = window.with_name("TWINC", "");
let window = window.build(event_loop)?;
let real_factor = (window.scale_factor() * factor as f64) as u32; let real_factor = (window.scale_factor() * factor as f64) as u32;
let inner_size = window.inner_size(); let inner_size = window.inner_size();

View file

@ -228,7 +228,7 @@ fn run_cli(
.position(|arg| arg == "--") .position(|arg| arg == "--")
.map(|extra_args_index| args[extra_args_index..].to_vec()); .map(|extra_args_index| args[extra_args_index..].to_vec());
for _ in cargo_exec( let mut i = cargo_exec(
"run", "run",
"cli", "cli",
triple, triple,
@ -236,7 +236,8 @@ fn run_cli(
debug, debug,
additional_flags, additional_flags,
true, true,
)? {} )?;
while let Some(Ok(_)) = i.next() {}
Ok(()) Ok(())
} }
@ -328,9 +329,15 @@ fn cargo_exec(
None None
}; };
let target_dir = METADATA
.get()
.unwrap()
.target_directory
.join(format!("xtargets/{renderer}"));
std::fs::create_dir_all(&target_dir)?;
let output = duct::cmd("cargo", args) let output = duct::cmd("cargo", args)
.stdout_capture() .env("CARGO_TARGET_DIR", target_dir)
.stderr_capture()
.reader()?; .reader()?;
Ok( Ok(