From c5a0218087e2d6323f36fdc19f45f2c666a779b7 Mon Sep 17 00:00:00 2001 From: David Chavez Date: Sun, 5 Jan 2025 21:54:12 +0100 Subject: [PATCH] Updates after the rebase --- lib/N64ModernRuntime | 2 +- lib/rt64 | 2 +- src/main/main.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/N64ModernRuntime b/lib/N64ModernRuntime index 45d1db0..b0fc967 160000 --- a/lib/N64ModernRuntime +++ b/lib/N64ModernRuntime @@ -1 +1 @@ -Subproject commit 45d1db07b0a151c89277f5dc89c53c58bfcf74eb +Subproject commit b0fc9672e4565f33f6ead97e65720c06f4485c6a diff --git a/lib/rt64 b/lib/rt64 index 45ef4dc..3599147 160000 --- a/lib/rt64 +++ b/lib/rt64 @@ -1 +1 @@ -Subproject commit 45ef4dc0aec7ee4fdc5e3da7faea06cd5170459c +Subproject commit 3599147b76a9edd752654c5fb441a2d8f31c67d0 diff --git a/src/main/main.cpp b/src/main/main.cpp index 588d294..de31645 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -121,8 +121,8 @@ ultramodern::renderer::WindowHandle create_window(ultramodern::gfx_callbacks_t:: #if defined(RT64_SDL_WINDOW_VULKAN) flags |= SDL_WINDOW_VULKAN; -#elif defined(RT64_SDL_WINDOW_METAL) - flags |= SDL_WINDOW_METAL; +#elif defined(__APPLE__) + flags |= SDL_WINDOW_VULKAN; #endif window = SDL_CreateWindow("Zelda 64: Recompiled", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1600, 960, flags);