Cargo.toml

@@ -21,8 +21,11 @@ librashader-reflect = { git = "https://git.alexjanka.com/alex/librashader" }
 librashader-runtime = { git = "https://git.alexjanka.com/alex/librashader" }
 librashader-runtime-vk = { git = "https://git.alexjanka.com/alex/librashader" }
 librashader-cache = { git = "https://git.alexjanka.com/alex/librashader" }
-ash = "0.38.0"
+ash = { git = "https://git.alexjanka.com/alex/ash", branch = "raw-window-handle-0.6.0" }
-ash-window = "0.13.0"
+ash-window = { git = "https://git.alexjanka.com/alex/ash", branch = "raw-window-handle-0.6.0" }
 
 [patch."https://github.com/RustAudio/baseview.git"]
 baseview = { git = "https://git.alexjanka.com/alex/baseview" }
+
+[patch.crates-io]
+ash = { git = "https://git.alexjanka.com/alex/ash", branch = "raw-window-handle-0.6.0" }

cli/Cargo.toml

@@ -13,4 +13,3 @@ gb-emu-lib = { workspace = true }
 clap = { version = "4.4", features = ["derive"] }
 ctrlc = "3.4"
 log = { workspace = true }
-env_logger = { workspace = true }

cli/src/main.rs

@@ -1,5 +1,7 @@
 #![feature(let_chains, if_let_guard, iter_array_chunks)]
 
+#[cfg(feature = "camera")]
+use camera::Webcam;
 use clap::{ArgGroup, Parser, Subcommand, ValueEnum};
 use frontend_common::{audio, debug::Debugger, window::ActiveWindowManager};
 use gb_emu_lib::{
@@ -122,7 +124,6 @@ impl From<Args> for frontend_common::RunOptions {
 }
 
 fn main() {
-    env_logger::init();
     let args = Args::parse();
 
     if let Some(subcommand) = args.command {

frontend-common/Cargo.toml

@@ -29,3 +29,4 @@ image = { version = "0.24", default-features = false, features = ["png"] }
 bytemuck = "1.14"
 chrono = "0.4"
 log = { workspace = true }
+env_logger = "0.11.1"

frontend-common/src/lib.rs

@@ -111,6 +111,7 @@ pub fn prepare(
     options: RunOptions,
     receiver: Receiver<EmulatorMessage<[u8; 4]>>,
 ) -> PreparedEmulator {
+    env_logger::init();
     let config = CONFIG_MANAGER.load_or_create_base_config();
     let standalone_config: StandaloneConfig = CONFIG_MANAGER.load_or_create_config();
 

gui/build.rs

@@ -1,8 +1,5 @@
 fn main() {
-    #[cfg(not(all(
+    // actions
-        target_os = "macos",
-        all(feature = "macos-ui", not(feature = "force-crossplatform-ui"))
-    )))]
     glib_build_tools::compile_resources(
         &["src/crossplatform/resources"],
         "src/crossplatform/resources/resources.gresource.xml",

lib/Cargo.toml

@@ -51,7 +51,7 @@ librashader-common = { workspace = true, optional = true }
 directories = { version = "5.0", optional = true }
 ron = { version = "0.8", optional = true }
 lazy_static = "1.4"
-wgpu = { version = "0.20", optional = true }
+wgpu = { version = "0.19", optional = true }
 thiserror = { workspace = true }
 log = { workspace = true }
 

lib/src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(let_chains, bigint_helper_methods)]
+#![feature(exclusive_range_pattern, let_chains, bigint_helper_methods)]
 
 use crate::processor::{memory::Memory, Flags};
 use connect::{AudioOutput, EmulatorCoreTrait, EmulatorMessage, EmulatorOptions, RomFile};

lib/src/processor/memory/addresses.rs

@@ -132,7 +132,7 @@ impl TryInto<IoAddress> for u16 {
     fn try_into(self) -> Result<IoAddress, Self::Error> {
         match self {
             0xFF00 => Ok(IoAddress::Joypad),
-            0xFF01..=0xFF02 => Ok(IoAddress::Serial(self.try_into().unwrap())),
+            0xFF01..0xFF03 => Ok(IoAddress::Serial(self.try_into().unwrap())),
             0xFF04..0xFF08 => Ok(IoAddress::Timer(self.try_into().unwrap())),
             0xFF0F => Ok(IoAddress::InterruptFlag),
             0xFF10..0xFF27 => Ok(IoAddress::Audio(self.try_into().unwrap())),