Compare commits

..

3 commits

Author SHA1 Message Date
Alex Janka 101a0fc062 update Things... 2024-05-26 11:06:46 +10:00
Alex Janka 24af9dd689 dont double init env_logger 2024-03-07 12:09:25 +11:00
Alex Janka 77e5632856 only build gtk resources if building gtk ui 2024-03-07 10:40:38 +11:00
10 changed files with 1076 additions and 889 deletions

1941
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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