From 4932f36da4fab3fc8965822bba473cbd20f7f405 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Fri, 12 Nov 2021 13:34:50 -0800 Subject: Fix compile errors under MSVC, remove PLATFORM_* macros in favor of compiler builtin macros, and add win32 support to FileStream --- core/src/Entrypoint/Backend_OpenGL3.cpp | 2 +- core/src/Entrypoint/main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core/src/Entrypoint') diff --git a/core/src/Entrypoint/Backend_OpenGL3.cpp b/core/src/Entrypoint/Backend_OpenGL3.cpp index 50dc78f..b4ae368 100644 --- a/core/src/Entrypoint/Backend_OpenGL3.cpp +++ b/core/src/Entrypoint/Backend_OpenGL3.cpp @@ -25,7 +25,7 @@ public: throw std::runtime_error("Failed to initialize GLFW."); } -# if PLATFORM_APPLE +# if defined(__APPLE__) // GL 3.2 + GLSL 150 const char* glslVersion = "#version 150"; glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); diff --git a/core/src/Entrypoint/main.cpp b/core/src/Entrypoint/main.cpp index 3cd3862..5ed7d84 100644 --- a/core/src/Entrypoint/main.cpp +++ b/core/src/Entrypoint/main.cpp @@ -21,7 +21,7 @@ using namespace std::literals::string_view_literals; static std::unique_ptr CreateDefaultBackend() { -#if PLATFORM_WIN32 +#if defined(_WIN32) # if BUILD_CORE_WITH_DX12_BACKEND if (auto backend = RenderingBackend::CreateDx12Backend()) { return backend; @@ -47,10 +47,10 @@ static std::unique_ptr CreateDefaultBackend() return backend; } # endif -#elif PLATFORM_MACOS +#elif defined(__APPLE__) // We currently only support using metal on macos return RenderingBackend::CreateMetalBackend(); -#elif PLATFORM_LINUX +#elif defined(__linux__) # if BUILD_CORE_WITH_VULKAN_BACKEND if (auto backend = RenderingBackend::CreateVulkanBackend()) { return backend; -- cgit v1.2.3-70-g09d2