redstrate/prism
Archived
1
Fork 0
Code Activity

Fix macOS build

Browse source
This commit is contained in:
redstrate 2021-05-10 07:58:22 -04:00
parent 39838aec0f
commit fea83fc2e3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/gfx/metal/src/gfx_metal.mm
View file

@ -458,7 +458,7 @@ GFXPipeline* GFXMetal::create_graphics_pipeline(const GFXGraphicsPipelineCreateI
if(file != std::nullopt) { if(file != std::nullopt) {
vertex_src = file->read_as_string(); vertex_src = file->read_as_string();
} else { } 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) { if(file != std::nullopt) {
fragment_src = file->read_as_string(); fragment_src = file->read_as_string();
} else { } 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) { if(file != std::nullopt) {
compute_src = file->read_as_string(); compute_src = file->read_as_string();
} else { } 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);
} }
} }

2
platforms/mac/main.mm.in
View file

@ -496,7 +496,7 @@ int main(int argc, char* argv[]) {
NSApp = [NSApplication sharedApplication]; NSApp = [NSApplication sharedApplication];
engine = new prism::Engine(argc, argv); engine = new prism::engine(argc, argv);
app = new @APP_CLASS@(); app = new @APP_CLASS@();
engine->set_app(app); engine->set_app(app);

2
tools/common/src/commoneditor.cpp
View file

@ -49,7 +49,7 @@ const std::map<ImGuiKey, InputButton> imToPl = {
CommonEditor::CommonEditor(std::string id) : id(id) { CommonEditor::CommonEditor(std::string id) : id(id) {
#ifdef PLATFORM_MACOS #ifdef PLATFORM_MACOS
file::set_domain_path(file::Domain::app, "../../../data"); file::set_domain_path(file::Domain::App, "../../../data");
#else #else
file::set_domain_path(file::Domain::App, "data"); file::set_domain_path(file::Domain::App, "data");
#endif #endif