From fea83fc2e314ad4f64eda487a12822b97e36fca3 Mon Sep 17 00:00:00 2001 From: redstrate <54911369+redstrate@users.noreply.github.com> Date: Mon, 10 May 2021 07:58:22 -0400 Subject: [PATCH] Fix macOS build --- engine/gfx/metal/src/gfx_metal.mm | 6 +++--- platforms/mac/main.mm.in | 2 +- tools/common/src/commoneditor.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/gfx/metal/src/gfx_metal.mm b/engine/gfx/metal/src/gfx_metal.mm index a2cb765..dad740e 100755 --- a/engine/gfx/metal/src/gfx_metal.mm +++ b/engine/gfx/metal/src/gfx_metal.mm @@ -458,7 +458,7 @@ GFXPipeline* GFXMetal::create_graphics_pipeline(const GFXGraphicsPipelineCreateI if(file != std::nullopt) { vertex_src = file->read_as_string(); } else { - console::error(System::GFX, "Failed to load vertex shader from {}!", vertex_path); + prism::log::error(System::GFX, "Failed to load vertex shader from {}!", vertex_path); } } @@ -490,7 +490,7 @@ GFXPipeline* GFXMetal::create_graphics_pipeline(const GFXGraphicsPipelineCreateI if(file != std::nullopt) { fragment_src = file->read_as_string(); } else { - console::error(System::GFX, "Failed to load fragment shader from {}!", fragment_path); + prism::log::error(System::GFX, "Failed to load fragment shader from {}!", fragment_path); } } @@ -663,7 +663,7 @@ GFXPipeline* GFXMetal::create_compute_pipeline(const GFXComputePipelineCreateInf if(file != std::nullopt) { compute_src = file->read_as_string(); } else { - console::error(System::GFX, "Failed to load compute shader from {}!", compute_path); + prism::log::error(System::GFX, "Failed to load compute shader from {}!", compute_path); } } diff --git a/platforms/mac/main.mm.in b/platforms/mac/main.mm.in index 19669a7..402ba69 100755 --- a/platforms/mac/main.mm.in +++ b/platforms/mac/main.mm.in @@ -496,7 +496,7 @@ int main(int argc, char* argv[]) { NSApp = [NSApplication sharedApplication]; - engine = new prism::Engine(argc, argv); + engine = new prism::engine(argc, argv); app = new @APP_CLASS@(); engine->set_app(app); diff --git a/tools/common/src/commoneditor.cpp b/tools/common/src/commoneditor.cpp index 0aba457..fee3959 100755 --- a/tools/common/src/commoneditor.cpp +++ b/tools/common/src/commoneditor.cpp @@ -49,7 +49,7 @@ const std::map imToPl = { CommonEditor::CommonEditor(std::string id) : id(id) { #ifdef PLATFORM_MACOS - file::set_domain_path(file::Domain::app, "../../../data"); + file::set_domain_path(file::Domain::App, "../../../data"); #else file::set_domain_path(file::Domain::App, "data"); #endif