Compare commits
3 commits
bf3a651f95
...
cdb16d8e15
Author | SHA1 | Date | |
---|---|---|---|
Alex Janka | cdb16d8e15 | ||
Alex Janka | 6ebcf1bd27 | ||
Alex Janka | 90d6d38625 |
|
@ -16,6 +16,8 @@ use gb_emu_lib::{
|
|||
use gilrs::{Button, Gilrs};
|
||||
use image::ImageBuffer;
|
||||
use raw_window_handle::HasDisplayHandle;
|
||||
#[cfg(target_os = "linux")]
|
||||
use winit::platform::wayland::WindowBuilderExtWayland;
|
||||
use winit::{
|
||||
dpi::PhysicalSize,
|
||||
event::{Event, WindowEvent},
|
||||
|
@ -337,8 +339,10 @@ where
|
|||
) -> anyhow::Result<(Self, RendererChannel)> {
|
||||
let window = WindowBuilder::new()
|
||||
.with_title("Gameboy")
|
||||
.with_resizable(resizable)
|
||||
.build(event_loop)?;
|
||||
.with_resizable(resizable);
|
||||
#[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 inner_size = window.inner_size();
|
||||
|
|
|
@ -228,7 +228,7 @@ fn run_cli(
|
|||
.position(|arg| arg == "--")
|
||||
.map(|extra_args_index| args[extra_args_index..].to_vec());
|
||||
|
||||
for _ in cargo_exec(
|
||||
let mut i = cargo_exec(
|
||||
"run",
|
||||
"cli",
|
||||
triple,
|
||||
|
@ -236,7 +236,8 @@ fn run_cli(
|
|||
debug,
|
||||
additional_flags,
|
||||
true,
|
||||
)? {}
|
||||
)?;
|
||||
while let Some(Ok(_)) = i.next() {}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
@ -328,9 +329,15 @@ fn cargo_exec(
|
|||
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)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.env("CARGO_TARGET_DIR", target_dir)
|
||||
.reader()?;
|
||||
|
||||
Ok(
|
||||
|
|
Loading…
Reference in a new issue