From 29710de146d520eebfa026c7a78fb0d691e2cb76 Mon Sep 17 00:00:00 2001 From: Dynamitos Date: Wed, 17 Jan 2024 09:37:54 +0100 Subject: [PATCH] It runs on MacOS --- .vscode/c_cpp_properties.json | 2 +- .vscode/launch.json | 13 +++++++++++++ CMakeLists.txt | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 77007ca..5ee5de9 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -28,7 +28,7 @@ ], "compilerPath": "/usr/bin/clang", "cppStandard": "c++20", - "intelliSenseMode": "clang-arm64", + "intelliSenseMode": "macos-lang-arm64", "configurationProvider": "ms-vscode.cmake-tools" } ], diff --git a/.vscode/launch.json b/.vscode/launch.json index cfa3daa..de0c603 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -24,6 +24,19 @@ "traceResponse": true } }, + { + "name": "Editor (Mac)", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceRoot}/bin/Editor", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceRoot}/bin", + "environment": [], + "externalConsole": false, + "MIMode": "lldb", + "targetArchitecture": "arm64" + }, { "name": "Editor (Linux)", "type": "cppdbg", diff --git a/CMakeLists.txt b/CMakeLists.txt index aaa2108..bf5270c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ target_link_libraries(Engine PUBLIC assimp::assimp) target_link_libraries(Engine PUBLIC KTX::ktx) target_link_libraries(Engine PUBLIC nlohmann_json::nlohmann_json) target_link_libraries(Engine PUBLIC crcpp) -target_link_libraries(Engine PUBLIC slang) +target_link_libraries(Engine PUBLIC shader-slang) target_link_libraries(Engine PUBLIC fmt::fmt) if(UNIX) target_link_libraries(Engine PUBLIC Threads::Threads)