From 251441f9fa305ffffda8dd02a3bb40fd64fe4e3d Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 10 Aug 2024 00:19:48 -0400 Subject: [PATCH] remove metal include, update platform includes --- src/app/core/controller.cc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/app/core/controller.cc b/src/app/core/controller.cc index 3141939d..4d11684a 100644 --- a/src/app/core/controller.cc +++ b/src/app/core/controller.cc @@ -7,17 +7,6 @@ #include "imgui/imgui.h" #include "imgui/imgui_internal.h" -#if defined(__APPLE__) && defined(__MACH__) -#include -#if TARGET_IPHONE_SIMULATOR == 1 -#include "imgui/backends/imgui_impl_metal.h" -#elif TARGET_OS_IPHONE == 1 -#include "imgui/backends/imgui_impl_metal.h" -#elif TARGET_OS_MAC == 1 - -#endif -#endif - #include #include "absl/status/status.h" @@ -276,14 +265,9 @@ void HandleMouseMovement(int &wheel) { absl::Status Controller::OnEntry(std::string filename) { #if defined(__APPLE__) && defined(__MACH__) -#if TARGET_IPHONE_SIMULATOR == 1 - /* iOS in Xcode simulator */ - platform_ = Platform::kiOS; -#elif TARGET_OS_IPHONE == 1 - /* iOS */ +#if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1 platform_ = Platform::kiOS; #elif TARGET_OS_MAC == 1 - /* macOS */ platform_ = Platform::kMacOS; #endif #elif defined(_WIN32) @@ -293,7 +277,6 @@ absl::Status Controller::OnEntry(std::string filename) { #else platform_ = Platform::kUnknown; #endif - RETURN_IF_ERROR(CreateSDL_Window()) RETURN_IF_ERROR(CreateRenderer()) RETURN_IF_ERROR(CreateGuiContext())